upgrade to Xtext 2.6.1
Merge remote-tracking branch 'origin/develop' into develop