changed to develop item 1
Merge branch 'master' into develop

Conflicts:
	playground.core/src/playground/core/parts/SamplePart.java
develop item 3