Merge branch 'dev-master'

Conflicts:
	public/scripts/app.js
	public/scripts/controllers/Dashboard.js