Merge remote-tracking branch 'origin/master'

Conflicts:
	public/js/controllers/dashboard.js
	public/partials/dashboard.html
	views/index.html
Merge remote-tracking branch 'origin/master'