merge
Merge branch 'master' of https://github.com/Viehauktion/viehauktion

Conflicts:
	views/framework.php