Merge branch 'master' of https://github.com/jthompsonNB/PetStore

Conflicts:

src/main/java/org/agoncal/application/petstore/web/AccountController.jav
a