temp
Merge branch 'master' of https://github.com/xieyajie/DoodleTee

Conflicts:
	DoodleTee/Classes/Effect/EffectPicker/XDDrawPicker.m
画泡泡j基础