no message
Merge branch 'master' of https://github.com/FredJiang/WTool

Conflicts:
	WTool.xcodeproj/project.xcworkspace/xcshareddata/WTool.xccheckout
	WTool/ToolsTests/WTextFieldTestViewController.m
	WTool/ToolsTests/WTextFieldTestViewController.xib