Changed java version to 1.7 in order to support newest features.
Merge pull request #21 from rvanheest/java1.7

Changed java version to 1.7 in order to support newest features.
Merge remote-tracking branch 'upstream/master' into webadmin_refactoring