Merge branch 'master' of https://github.cos

Conflicts:
	public/javascripts/dashboard-script.js
dsa