Merge branch 'dev-master'

Conflicts:
	public/scripts/app.js
	public/scripts/controllers/Admin.js
	public/scripts/controllers/Dashboard.js
	public/scripts/controllers/User.js
	public/scripts/shared/Directives.js
	public/scripts/shared/Services.js
new build