nomis weiter ja
Merge branch 'master' of https://github.com/schindy/kn0rzel

Conflicts:
	conf/evolutions/default/1.sql
	conf/evolutions/default/1.sql~