Cardmanagement
Cardmanagement
Merge branch 'tobi' into development

Conflicts:
	lib/MysqlAdapter.php
	view/card/CardView.php