Merge origin/develop into develop

Conflicts:
	src/test/Test.java