Set heroku runtime to java 1.8
Latest DAO plumbling
For some reason Git won't ignore this file...
Merge remote-tracking branch 'origin/master'

Conflicts:
	target/maven-archiver/pom.properties