修改
Signed-off-by: q340341043 <340341043@qq.com>
添加我的赠券列表项布局
Merge branch 'dev-ywt' of https://github.com/hnlshzx/PPMoneyClient into dev-ywt

Conflicts:
	.classpath
合并Dev
Merge remote-tracking branch 'remotes/origin/dev' into dev-ywt

Conflicts:
	res/values/colors.xml
	src/com/pmp/ppmoney/PPMoneyApplication.java
解决冲突
Merge branch 'dev-ywt' of https://github.com/hnlshzx/PPMoneyClient into dev-ywt

Conflicts:
	.classpath
	res/values/colors.xml
解决冲突
合并
Merge branch 'dev' of https://github.com/hnlshzx/PPMoneyClient into dev

Conflicts:
	res/values/colors.xml
	src/com/pmp/ppmoney/PPMoneyApplication.java
提交
修改.classpath
Merge branch 'dev-ywt' of https://github.com/hnlshzx/PPMoneyClient into dev-ywt

Conflicts:
	src/com/pmp/ppmoney/PPMoneyApplication.java
Merge branch 'dev' of https://github.com/hnlshzx/PPMoneyClient into dev

Conflicts:
	res/values/colors.xml
	src/com/pmp/ppmoney/PPMoneyApplication.java
解决冲突
Merge branch 'dev' of https://github.com/hnlshzx/PPMoneyClient into dev
Merge branch 'dev-ls' into dev

Conflicts:
	res/values/colors.xml
	src/com/pmp/ppmoney/PPMoneyApplication.java
合并
Merge branch 'dev-ywt' of https://github.com/hnlshzx/PPMoneyClient into dev-ywt
Merge branch 'dev' of https://github.com/hnlshzx/PPMoneyClient into dev