Added location handler when returning to edit from edit_alias
Merge branch 'master' of https://github.com/Bonfire-Modules/file_manager.git