test
Merge branch 'master' of
https://github.com/teamwahnsinn/teamwahnsinn.git

Conflicts:
	src/main/java/at/hackathon2014/wahnsinn/wahnsinnsapp/pages/HomePage.html
merged