Fixing stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/src/com/GGI/Components/Circle.java