Working code, generated by muzy
Merge branch 'muzy-dev' of https://github.com/C3MA/uberschalter into muzy-dev

Conflicts:
	web/www/index.html