servlet
merge fix
Initial user implementation and some class stubs
Implemented Room class with getters
Merge pull request #1 from mateoi/mateo

Mateo
Added AdminUser stub class. I'll add functionality once DBAdapter is coded
Merge pull request #2 from mateoi/mateo

Added AdminUser stub class. I'll add functionality once DBAdapter is cod...
loads of stuff