Added JDK 1.7

Remember to delete JAVA_HOME from path.macros and add JAVA_JDK6 and JAVA_JDK7