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

Conflicts:
	bin/compile
Merge commit 'fc841b4b4c10f7a761063c4d21971b1613d9b271'

Conflicts:
	bin/compile