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

Conflicts:
	.gitignore
	code/src/main/resources/config/database/db.properties.sample
no message
Merge branch 'master' of https://github.com/volterr/FavorTripPals