Merge branch 'upstream/master' into edit_projects

Conflicts:
	index.html
	js/controller/dashboard.js
	js/controller/projectView.js
	js/factories/project.js
	partials/dashboard.html