no message
Merge branch 'master' of github.com:fqlhnx/lightBeeFramework

Conflicts:
	lightBee/lightBee.xcodeproj/project.xcworkspace/xcuserdata/liuhongnian.xcuserdatad/UserInterfaceState.xcuserstate