galaxy vorschaltseite
Merge branch 'master' of https://github.com/thsur/voice

Conflicts:
	views/no_webgl.html