General Updating
Merge remote-tracking branch 'origin/master'

Conflicts:
	Distinct Vigor/core/src/com/stig/distinctvigor/states/Play.java