@update - Select category design done.
Merge branch 'develop' of https://github.com/lihao6485/ComputeME into develop

Conflicts:
	ComputeMe/ComputeMe.xcodeproj/project.pbxproj