Update grammar to extend Xbase, deal with resulting DSL scoping issues, implement initial JVM model inferrer
Merge branch 'xbase-ify'