вернул пока старый AMD
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/module.js
	app/controllers/package.js
	app/controllers/site.js
	app/directives/module.js
	app/directives/package.js
	app/filters/module.js
	app/filters/package.js
	app/main.js
	app/modules/account/controllers/home.js
	app/modules/account/controllers/package.js
	app/modules/account/directives/package.js
	app/modules/account/directives/users.js
	app/modules/account/main.js
	app/modules/admin/controllers/admin.js
	app/modules/admin/controllers/groups.js
	app/modules/admin/controllers/package.js
	app/modules/admin/controllers/users.js
	app/modules/admin/directives/package.js
	app/modules/admin/directives/users.js
	app/modules/admin/main.js
	app/modules/exit/controllers/home.js
	app/modules/exit/controllers/package.js
	app/modules/exit/main.js
	app/modules/home/controllers/home.js
	app/modules/home/controllers/package.js
	app/modules/home/main.js
	app/modules/login/controllers/home.js
	app/modules/login/controllers/package.js
	app/modules/login/main.js
	app/modules/recovery/controllers/home.js
	app/modules/recovery/controllers/package.js
	app/modules/recovery/main.js
	app/modules/reg/controllers/home.js
	app/modules/reg/controllers/package.js
	app/modules/reg/main.js
	app/modules/user/controllers/home.js
	app/modules/user/controllers/package.js
	app/modules/user/main.js
	app/services/KEY.js
	app/services/Notification.js
	app/services/module.js
	app/services/package.js
	app/services/websocket.js
	index_old.html