添加用户权限，地图图标根据不同风险值设置不同颜色，基本完善功能
Merge branch 'master' of https://github.com/xiaozhujun/riskplatform-android

Conflicts:
	bin/RiskPlatform.apk
	bin/classes.dex
	bin/classes/org/whut/platform/EquipInfoActivity$MyHandler.class
	bin/classes/org/whut/platform/EquipInfoActivity.class
	bin/classes/org/whut/platform/InfoActivity.class
	bin/classes/org/whut/platform/ListActivity$MyTask.class
	bin/classes/org/whut/platform/ListActivity.class
	bin/classes/org/whut/platform/MainActivity.class
	bin/classes/org/whut/platform/MapActivity$5.class
	bin/classes/org/whut/platform/MapActivity$6.class
	bin/classes/org/whut/platform/MapActivity$7.class
	bin/classes/org/whut/platform/MapActivity$8.class
	bin/classes/org/whut/platform/MapActivity$9.class
	bin/classes/org/whut/platform/MapActivity$AreaThread.class
	bin/classes/org/whut/platform/MapActivity$GetAreaThread.class
	bin/classes/org/whut/platform/MapActivity$GetCityThread.class
	bin/classes/org/whut/platform/MapActivity$GetProvinceThread.class
	bin/classes/org/whut/platform/MapActivity$MyHandler.class
	bin/classes/org/whut/platform/MapActivity$MyOverlay.class
	bin/classes/org/whut/platform/MapActivity.class
	bin/classes/org/whut/platform/R$id.class
	bin/classes/org/whut/platform/R$layout.class
	bin/classes/org/whut/platform/R$menu.class
	bin/classes/org/whut/platform/R$string.class
	bin/classes/org/whut/platform/R$style.class
	bin/classes/org/whut/platform/RankActivity$2.class
	bin/classes/org/whut/platform/RankActivity$3.class
	bin/classes/org/whut/platform/RankActivity$4.class
	bin/classes/org/whut/platform/RankActivity$5.class
	bin/classes/org/whut/platform/RankActivity.class
	bin/classes/org/whut/platform/ShowListActivity$GetDataTask.class
	bin/classes/org/whut/platform/ShowListActivity.class
	bin/classes/org/whut/strings/UrlStrings.class
	bin/classes/org/whut/utils/JsonUtils.class
	bin/resources.ap_
	gen/org/whut/platform/R.java
	res/values/strings.xml
	src/org/whut/platform/AreaRankActivity.java
	src/org/whut/platform/MapActivity.java
	src/org/whut/strings/UrlStrings.java
	src/org/whut/utils/JsonUtils.java