Changing to JDK7 and changing version to 0.6.0 to signal JDK change.
Merge branch 'jdk7'