Merge branch 'matcap_branch'

Conflicts:
	core/bin/com/trashgames/trashsoccer/screen/PlayScreen.class
	core/src/com/trashgames/trashsoccer/screen/PlayScreen.java