modified:   package.json
	modified:   setup.js
	modified:   static/admin/css/desktop.css
	new file:   static/admin/images/icons/32/page_white_magnify.png
	new file:   static/admin/images/icons/page_white_magnify.png
	modified:   static/admin/index.html
	new file:   static/admin/locale/en.js
	modified:   static/admin/locale/ru.js
	modified:   static/admin/modules/pages/controller/Main.js
	modified:   static/admin/starter.js
	renamed:    www/localhost/static/js/jquery.js -> static/js/jquery.js
	modified:   static/js/login.js
	deleted:    www/localhost/static/js/jquery.cookie.js
	deleted:    www/localhost/static/js/login.js
	modified:   www/localhost/view/login.tpl
Merge branch 'master' of https://github.com/Kolbaskin/yode-server