Peters changes
Merge branch 'ptdev' of https://github.com/referralwire/Web into skdev

Conflicts:
	src/main/webapp/Templates/StdMasterDetailView.html
	src/main/webapp/js/rwRouter.js
	target/maven-archiver/pom.properties
	target/web.war
	target/web/Templates/StdMasterDetailView.html
	target/web/WEB-INF/lib/API-DROP1.jar
	target/web/WEB-INF/lib/TestSetup-DROP1.jar
	target/web/WEB-INF/lib/persistence-DROP1.jar
	target/web/WEB-INF/lib/rwPersistence.log
	target/web/js/main.js