commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
	res/layout/activity_home.xml
	res/layout/activity_order_list.xml
	res/layout/order_list.xml
	res/values/color.xml
	res/values/strings.xml
	src/com/zhijianlife/core/activity/HomeActivity.java
	src/com/zhijianlife/core/activity/LoginActivity.java
	src/com/zhijianlife/core/activity/OrderListActivity.java
commit