Revert "Changed Java Version to Java 7"

This reverts commit d29d5bac894b578247ab86ac062e9cacb1e2639d.
Revert "Revert "Changed Java Version to Java 7""

This reverts commit 5401d4d0258d77acae96be9ecf4193d7b9bb0429.