Add "Edit Caption" to embedded gallery for logged-in users
Added FileManager::add_webroot() and FileManager::strip_webroot() to ensure more consistent file paths
Added more use cases to FileManager::add_root() and FileManager::strip_root()
Replace substr with FileManager::strip_webroot; call jquery.filemanager.js from the gallery handler
Fixed #prefix# issue in import-db by removing connection logic
hotfix for mongo test suite
Merge pull request #172 from jonphipps/update_mongo_test

hotfix for mongo tests
Merge pull request #171 from twheel/upstream

Add "Edit Caption" to embedded gallery for logged-in users
Fixed passing a single item to I18n::export()
Merge branch 'master' of github.com:jbroadway/elefant
String with '0' shouldn't evaluate as empty in Validator::validate()
Updated version
Merge remote-tracking branch 'upstream/master'

Conflicts:
	apps/filemanager/views/gallery/embedded.html
Removing configuration files from cache