Used version 4.0.6.RELEASE of Spring.
Used version 2.1.5 of heroku-support.
Used version 1.8.1 of appassembler-maven-plugin.
Merge branch 'master' into http_auth

Conflicts:
	src/main/java/com/interzonedev/hyepye/process/Webapp.java