选择时间模仿河狸甲
订单确定页面模仿美丽说
订单中心目前只有暂定页面
Merge branch 'master' of https://github.com/pancat/nail_care_client

Conflicts:
	Meijia/project.properties
	Meijia/res/drawable-xhdpi/Thumbs.db
	Meijia/res/layout/order_author_activity.xml
	Meijia/res/values/strings.xml
	Meijia/src/com/pancat/fanrong/activity/OrderAuthorActivity.java