upgrade to Xtext 2.6.1
Merge branch 'develop-2.0.0' into develop
back to Java 1.7