Deliverer Controller
Merge branch 'master' of https://github.com/Querschlag/hardware-management

Conflicts:
	www/_php/test/MockDatabase.php
Merge branch 'master' of https://github.com/Querschlag/hardware-management