modified:   plugins/search/engine.js
	deleted:    plugins/search/indexer.sh
	modified:   plugins/search/search.js
	deleted:    plugins/search/searchd.conf
	modified:   plugins/search/sphinx.conf
	modified:   www/localhost/plugins/hellomvc.js
Merge branch 'master' of https://github.com/Kolbaskin/yode-server
	modified:   index.js
	modified:   node_modules/gc/index.js
	modified:   package.json
	modified:   plugins/admin/models/data.js
	modified:   plugins/admin/models/datafunctions.js
	modified:   plugins/admin/models/fileOperations.js
	modified:   plugins/default.js
	modified:   plugins/search/engine.js
	deleted:    plugins/search/sphinx.conf
	modified:   static/admin/core/ComboColumn.js
	modified:   static/admin/core/Controller.js
	modified:   static/admin/core/GridWindow.js
	modified:   static/admin/core/widgets/ImageField.js
	modified:   static/admin/modules/pages/controller/Pages.js
	modified:   static/admin/modules/pages/model/PagesModel.js
	modified:   static/admin/modules/pages/view/PageEditForm.js
	modified:   subserver.js