Progress coloring
Merge remote-tracking branch 'origin/master'

Conflicts:
	AnediaJSTeamWork/AnediaJSTeamWork/scripts/main.js