Merge "Updating Idegen project to use JDK 1.7"