index on brian: 7b2d750 moved Templates into appropriate directory, added html test
WIP on brian: 7b2d750 moved Templates into appropriate directory, added html test
Merge commit 'stash' into brian

Conflicts:
	src/main/java/com/systemsinmotion/petrescue/config/PetRescueConfig.java
	src/main/resources/META-INF/spring/petrescue-core.xml
Merge branch 'brian' of https://github.com/SystemsInMotion/PetRescue-Core into brian

Conflicts:
	src/main/java/com/systemsinmotion/petrescue/config/PetRescueConfig.java