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

Conflicts:
	app/js/config.js
test