Added a temporary label class
Merge remote-tracking branch 'origin/master'

Conflicts:
	Greywater/src/com/teamsweepy/greywater/ui/GameScreen.java