Add UserController functionality
Merge branch 'master' of https://github.com/Querschlag/hardware-management into HEAD

Conflicts:
	www/_web/management/rooms.php
Merge branch 'master' of https://github.com/Querschlag/hardware-management into HEAD

Conflicts:
	www/_php/test/MockDatabase.php
	www/_web/css/content.css
	www/_web/management/create_room.php
	www/_web/management/room.php
	www/_web/management/rooms.php
Merge branch 'master' of https://github.com/Querschlag/hardware-management into HEAD
Added room functionality

Conflicts:
	www/_php/database/Database.php
	www/_php/interface/IDatabase.php
	www/_web/php/template.php
Merge remote-tracking branch 'origin/master' into HEAD