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

Conflicts:
	NeurolutionGDX-desktop/.classpath