modified:   modules/admin/models/fm.js
	modified:   modules/admin/models/valueTypes.js
	deleted:    static/admin/modules/filemanager/controller/fm.js
	deleted:    static/admin/modules/filemanager/model/fm.js
	deleted:    static/admin/modules/filemanager/store/Store.js
	deleted:    static/admin/modules/filemanager/view/FilesList.js
	deleted:    static/admin/modules/filemanager/view/OpenFileDialog.js
	deleted:    static/admin/modules/filemanager/view/Win.js
Merge branch 'master' of https://github.com/Kolbaskin/yode-server

Conflicts:
	modules/admin/models/valueTypes.js