Merge remote-tracking branch 'origin/MattBranch'

Conflicts:
	core/src/Screens/BoardScreen.java