Merge remote-tracking branch 'origin/master' into SFWPonyPack

Conflicts:
	05.gif
	a2m.gif
	ccb.gif
	clowncock.gif
	dong.gif
	flaccid.gif
	gizz.gif
	goatse.gif
	gooncamp.gif
	huh.gif
	longdong.gif
	metis.gif
	rapetraingizz.gif
	sdong.jpg
	sonia.gif
Merge branch 'SFWPonyPack' of https://github.com/XyyxShard/Ponysquad-Emote-Pack into SFWPonyPack