Fix java 7 compile compliance
Merge branch 'master' of https://github.com/CILEA/JDynA