commit from office
Merge branch 'master' of https://github.com/zhengmingc/TouchTracker

Conflicts:
	BNRDrawView.m
	BNRDrawViewController.h
	BNRDrawViewController.m
	TouchTracker.xcodeproj/project.pbxproj
	TouchTracker.xcodeproj/project.xcworkspace/xcuserdata/wenwen.xcuserdatad/UserInterfaceState.xcuserstate