heroku building/running
Merge branch 'master' of git@github.com:w2ogroup/heroku-buildpack-java.git

Conflicts:
	bin/compile