Refactoring for Scala 2.11.2 and JAva 8 support
Merge branch 'master' of https://github.com/SINTEF-9012/ThingML