change to Java 7
Merge origin/master
Add skeleton files.
Change to Java 7.
Merge origin/master