v4
mv scores
Merge remote-tracking branch 'tp/v4' into dev

Conflicts:
	Gruntfile.js
	package.json