产品显示页面的基本实现
Merge branch 'master' of https://github.com/pancat/nail_care_client.git

Conflicts:
	Meijia/AndroidManifest.xml
	Meijia/res/values/strings.xml