BugFix
Bugfix 2
Merge branch 'master' of https://github.com/Querschlag/hardware-management

Conflicts:
	www/_php/database/Database.php