Sync
Merge remote-tracking branch 'origin/master'

Conflicts:

	src/main/java/org/agoncal/application/petstore/web/AccountController.java
Merge remote-tracking branch 'origin/master'

Conflicts:

	src/main/java/org/agoncal/application/petstore/web/AccountController.java
	src/main/webapp/WEB-INF/beans.xml