modifies the source code to be conform to the java version 1.6; the test code still needs java 1.7
Merge pull request #64 from boeserwolf91/java6