Color changes
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	italy.html