gradle changes for heroku deployment
added system.properties for jdk 1.7 heroku
heroku changes
fix conflicts