Finish 0.4-a6-fix1
Merge remote-tracking branch 'ufna/master'

Conflicts:
	Source/VaOceanPlugin/Classes/VaOceanStateActor.h
Removed static property for the sprite so don't get warning with the OceanStateActor