merging filemanager branch as squash
added devise