cell sort add
log update
Merge branch 'dev'

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