#10 图片自动裁剪
Merge branch 'master' of https://github.com/xieyajie/DoodleTee

Conflicts:
	DoodleTee/Classes/Effect/EffectPicker/XDImagePicker.m