Merge branch '13x'

# Conflicts:
#	tests/org.eclipse.emf.edapt.tests/META-INF/MANIFEST.MF

Change-Id: I7f00d04282544b1e4b4be5b7a727bb3f7c77149e
Signed-off-by: Johannes Faltermeier <jfaltermeier@eclipsesource.com>
tree: 244c38f7b4ce5fb7f1a379ac5c957559cd07f2db
  1. builds/
  2. examples/
  3. features/
  4. plugins/
  5. tests/
  6. .gitignore