switched to 1.7 JDK
Merge remote-tracking branch 'origin/master'