扎点的
Merge branch 'master' of https://github.com/dazhi007/nearyby

Conflicts:
	res/layout/activity_search_range.xml
	src/com/dazhi/nearby/SearchRefreshWithRangeActivity.java