Modified the DSL to reflect new model package, remove Xtext nature
warning, added custom scoping, removed GlobalScope
Merge remote-tracking branch 'origin/master'