ameliorations by francois
merge branch 'master' of https://github.com/teogeos/mines-travel

Conflicts:
	src/main/java/org/springframework/samples/travel/infrastructure/security/InDatabaseUserDetailsService.java