cleaning up launcher
new css and new life
Merge branch 'master-emax' into gulp

Conflicts:
	html/index.html