cell的info view差不多了，放弃了日系风格图标。
大拇指！
Merge remote-tracking branch 'origin/0120么么哒' into 1223么么哒！

Conflicts:
pa/ThePaApp.xcodeproj/project.pbxproj

pa/ThePaApp.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.
xcuserstate

pa/ThePaApp.xcworkspace/xcuserdata/admin.xcuserdatad/xcdebugger/Breakpoi
nts_v2.xcbkptlist
pa/ThePaApp/WOCollectionViewController.m
Revert "解决了好些问题嘻嘻"

Conflicts:
	pa/ThePaApp.xcodeproj/project.pbxproj

pa/ThePaApp.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.
xcuserstate

pa/ThePaApp.xcworkspace/xcuserdata/admin.xcuserdatad/xcdebugger/Breakpoi
nts_v2.xcbkptlist
	pa/ThePaApp/WOCollectionViewController.m
Revert 62692e8..2450bf3

This rolls back to commit 62692e830b252eb1636a26e8a85868f5f41fe339.
111
Merge remote-tracking branch 'origin/0120么么哒' into 1223么么哒！

This reverts commit 62692e830b252eb1636a26e8a85868f5f41fe339.

Conflicts:

pa/ThePaApp.xcworkspace/xcuserdata/tao.xcuserdatad/UserInterfaceState.xc
userstate
	pa/ThePaApp/WOCollectionViewController.m
22
Revert dcbc060..9120c8e

This rolls back to commit dcbc060d8170ec8d46c79c118040771585e36a83.
hohoha