Merge branch 'admin' of https://github.com/ruahman/rpm-angular-react into HEAD

Conflicts:
	app/models/administrator.coffee
	app/models/administrator.js
	app/models/login.coffee
	app/models/login.js
Merge branch 'temp' into menu-admin