adsasd
Signed-off-by: gongsi <gongsi@163.com>
Merge branch 'develop' into jia

Conflicts:
	gen/com/weipai/R.java
	src/com/weipai/MainActivity.java
	src/com/weipai/data/RequestData.java