test
Merge branch 'master' of github.com:Maltretieren/maltretieren.github.com

Conflicts:
	app/js/controllers.js
test