adding fading between objectives
Merge branch 'master' into pks/results_page/master

Conflicts:
	Session_1/public_html/js/GameScreen.js