POM update
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml
Committing my local properties file
Update POM to use generate-resources phase for property file transfer to avoid first-time run problems