eyecandy
Merge branch 'master' of https://github.com/w84death/rathaus

Conflicts:
	web/app/main.js