some belayed changes
Merge branch 'master' of https://github.com/quaquel/EMAworkbench.git
project file, perhaps this should be added to the ignore....