sttets
Merge branch 'Development' into Feature2

Conflicts:
	HelloWorld/src/ClassOne.java