v0.018

整合find模块
Merge remote-tracking branch 'origin/qiu'

Conflicts:
	AndroidManifest.xml
	res/layout/activity_make_particulars.xml
	res/layout/particular_popupwindow.xml
	src/com/velvol/o2o/ui/make/ParticularsActivity.java
fix merge problem