final design changes
Merge branch 'final-design' into develop

Conflicts:
	build/js/player.js