temp file after build of application
file for new admin function like content overview , charts
Merge branch 'dev-master'

Conflicts:
	app/config/dms.php
	public/scripts/app.js
	public/scripts/controllers/Dashboard.js
	public/scripts/controllers/User.js
	public/scripts/shared/Directives.js
	public/scripts/shared/Services.js