modified:   app/js/app.js
	modified:   app/js/controllers.js
	modified:   app/section/manager.html
Merge branch 'master' of https://github.com/ndk-/RestMS

Conflicts:
	app/section/manager.html

	modified:   app/section/manager.html