Added function to return card
Added update to database class
Merge remote-tracking branch 'origin/master'

Conflicts:
	php/Database.php
Merge remote-tracking branch 'origin/master'
Added complete return card functionality
Merge remote-tracking branch 'origin/master'

Conflicts:
	header.php