- bugfix database class
 - user rental check function
Merge remote-tracking branch 'origin/master'

Conflicts:
	php/Database.php