mast001
Merge branch 'master' into develop

Conflicts:
	Examples/src/main/java/TestClass.java