manage两个委托方法加了参数。修改了菜单的手势冲突
test
Merge branch 'master' of https://github.com/Robinisabadguy/Paint into Robinisabadguy-master

Conflicts:
	MagicPaint.xcodeproj/project.xcworkspace/xcshareddata/MagicPaint.xccheckout
	paint/KKSPainting/Manager/KKSPaintingManager.m