newline

nrelinw
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	src/DragCircle.java
Revert "newline"

This reverts commit cad34fd749ad393a61b01323139d7a4369cc20c9.