change java version 1.6 to 1.7
Merge branch 'master' of https://github.com/OpenSourceConsulting/athena-peacock.git