Merge rooms.php
Merge branch 'master' of https://github.com/Querschlag/hardware-management

Conflicts:
	www/_web/management/rooms.php