fix for merge
Merge branch 'dev-1'

Conflicts:
	Metic.xcodeproj/project.xcworkspace/xcuserdata/ligang5.xcuserdatad/UserInterfaceState.xcuserstate
Merge branch 'master' into dev-1

Conflicts:
	Metic.xcodeproj/project.xcworkspace/xcuserdata/ligang5.xcuserdatad/UserInterfaceState.xcuserstate
using mine