Dashboard
Merge branch 'master' of https://github.com/kennysong/SATisfaction

Conflicts:
	client/dashboard.html