paiting
Merge branch 'master' of https://github.com/wuhaizeng/ImageDrawer

Conflicts:

AppShowWine/AppShowWine.xcodeproj/project.xcworkspace/xcshareddata/AppSh
owWine.xccheckout
	AppShowWine/AppShowWine/ViewControllers/WPaintingSizeVC.m