Lots of changes:
Imported v3.1
Enabled CC_Enabled_Experimental Effects, by replacing each #if statement with CC_Enabled_Experimental_Effects 2
Fixed some physics bugs with the hero