merging
Merge remote-tracking branch 'origin/master'

Conflicts:
	EffectTransform/EffectTransform/EffectManager.h