m
Merge branch 'master' of github.com:mateoi/bookaroom
m
merge
m
change
Merge branch 'master' of https://github.com/mateoi/bookaroom

Conflicts:
	webapps/ROOT/WEB-INF/classes/core/User.class
	webapps/ROOT/WEB-INF/classes/utils/DBAdapter.class
stuff