preferencestest
Merge remote-tracking branch 'origin/master'

Conflicts:
	DinoTopHat/core/src/com/dinoth/logic/PlayLogic.java