Merge branch 'lib_separation' into friendly_url
tree398109e4fc6decc5f5d831fac26954b63ca4badb
drwxr-xr-x - _res