Merge pull request #9 from apache/master

Merge Apache
CS-1353 | Changed the version of java to 7
Merge pull request #45 from robdouglas/CS-1353

Cs 1353