Create system.properties
Allow heroku to build using java 7
Merge branch 'heroku' into heroku-mgmtwebapp