Merge branch 'master' into springboot

Conflicts:
	pom.xml
	readme.md
	src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetRepositoryImpl.java
	src/main/java/org/springframework/samples/petclinic/web/VetController.java
	src/test/java/org/springframework/samples/petclinic/web/CrashControllerTests.java
	src/test/java/org/springframework/samples/petclinic/web/OwnerControllerTests.java
	src/test/java/org/springframework/samples/petclinic/web/PetControllerTests.java
	src/test/java/org/springframework/samples/petclinic/web/VetControllerTests.java
	src/test/java/org/springframework/samples/petclinic/web/VisitControllerTests.java