Changed java version back to 1.6
Merge branch 'master' of https://github.com/woutwoot/BarAPI.git