fix some bugs
modify product detail
Merge branch 'master' of http://github.com/tongjiapp/iOS

Conflicts:
	Pods/Pods.xcodeproj/project.pbxproj
forget