Merge branch 'master' of https://git@github.com/wisegps/baba.git

Conflicts:
	AndroidManifest.xml
cfsdfghd

Signed-off-by: wang <wang@wang-PC>
Signed-off-by: honesty <371278698@qq.com>
Merge branch 'master' of https://git@github.com/wisegps/baba.git

Conflicts:
	src/pubclas/GetSystem.java

Signed-off-by: wang <wang@wang-PC>
车辆，手机图标修改

Signed-off-by: honesty <371278698@qq.com>
kdfgjkdjfgkdfglasldfk

Signed-off-by: wang <wang@wang-PC>
Signed-off-by: honesty <371278698@qq.com>
Merge branch 'master' of git@github.com:wisegps/baba.git

Conflicts:
	AndroidManifest.xml
修改定位图片

Signed-off-by: honesty <371278698@qq.com>
图标修改

Signed-off-by: honesty <371278698@qq.com>
Merge branch 'master' of local repository into ServiceProvider

Conflicts:
	res/layout/activity_set.xml
	src/com/wise/setting/SetActivity.java