resize
Merge branch 'master' of https://github.com/reward-hunters/HeadShop

Conflicts:
	HeadShop/RH.HeadShop/Render/ctrlTemplateImage.cs
Merge branch 'master' of https://github.com/reward-hunters/HeadShop

Conflicts:
	HeadShop/RH.HeadShop/Render/ctrlTemplateImage.cs