card management dev
Merge branch 'feature_card_mgmt'
Merge branch 'master' into develop

Conflicts:
	app/routes.php
Merge branch 'develop' of https://github.com/aowie1/CAH-online into develop