商品详情界面设计完成
Merge branch 'master' of https://github.com/runyetech/find-android

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	gen/com/runyetech/find2/R.java
	project.properties
	res/values/color.xml
	src/com/runyetech/find2/FragmentDebug.java