commit to fix sync issues
Merge branch 'nthomas' of https://github.com/SystemsInMotion/Guardian-Angel-Animal-Rescue into nthomas

Conflicts:
	src/main/java/org/gaar/web/controller/mvc/AdoptionController.java

	modified:   src/main/java/org/gaar/web/controller/mvc/AdoptionController.java
	new file:   src/main/resources/velocity/adoption-request.vm
	new file:   src/test/java/org/gaar/Entities.java
	new file:   src/test/java/org/gaar/web/controller/mvc/AdoptionControllerTest.java