Style adjustments and add context zone data to scene 2
Merge branch 'master' of github.com:theefer/gu-2030

Conflicts:
	app/index.html