Merge pull request #1 from mateoi/mateo

Mateo
Merge pull request #2 from mateoi/mateo

Added AdminUser stub class. I'll add functionality once DBAdapter is cod...
loads of stuff
DB adapter
db adapter + folder restructure
db adapter small change
update
mmm
added index page
progress
more progress
progress
changes
siga
merges
Merge branch 'master' into sergiu

Conflicts:
	webapps/ROOT/accountCreated.jsp
m
Merge branch 'master' of github.com:mateoi/bookaroom
room browse
ROOM browse
new stuf