replaced with master item 2
Merge branch 'master' into develop

Conflicts:
	playground.core/src/playground/core/parts/SamplePart.java