shixu
aha
Test
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/layout/activity_normal_book.xml
	app/src/main/res/values/strings.xml
fock
fock updata
添加了订单model,包含了jpush sdk