m3 models are now identified by a location instead of a string
optimized merging of m3 models
Merge branch 'master' of github.com:cwi-swat/rascal