changing to Java 7 fronted
Merge commit '4f94052100bec5a95f49d8c4c9092539f8796175' into develop