Change java version to 1.7
Merge remote-tracking branch 'origin/develop' into develop