no message
Merge branch 'master' of https://github.com/volterr/FavorTripPals

Conflicts:
	code/src/main/webapp/user.xhtml