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

Conflicts:
	src/com/wise/car/SearchMapActivity.java
Merge branch 'master' of https://git@github.com/wisegps/baba.git

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

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

Signed-off-by: wang <wang@wang-PC>