Test merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/src/multipong/settings/Settings.java