v0.023

不整合版本
Merge branch 'qiu' of https://github.com/Domonlee/Velvol into qiu

Conflicts:
	AndroidManifest.xml
	res/color/make_shop_radiobutton.xml
	res/values/color.xml
	src/com/velvol/o2o/ui/make/ParticularsActivity.java
v0.025

不整合版本
Merge branch 'qiu' of https://github.com/Domonlee/Velvol into qiu

Conflicts:
	.classpath
	AndroidManifest.xml
	src/com/velvol/o2o/ui/make/ParticularsActivity.java