hr bean
comment conflict
Merge branch 'master' of https://code.google.com/p/swimv2-paladino-pogliani-tommasini
userprofile
Login and registration
Merge branch 'master' of https://code.google.com/p/swimv2-paladino-pogliani-tommasini

Conflicts:
	swimv2-web/src/main/webapp/WEB-INF/web.xml