Delta
Merge branch 'master' into TextManager

Conflicts:
	Piggy_Game/Piggy_Game.vcxproj.filters