bug fix
Merge branch 'master' into slider3

Conflicts:
	todo.xcodeproj/project.xcworkspace/xcuserdata/couzip.xcuserdatad/UserInterfaceState.xcuserstate
Merge branch 'slider3'

Conflicts:
	todo.xcodeproj/project.xcworkspace/xcuserdata/couzip.xcuserdatad/UserInterfaceState.xcuserstate
bug fix