fix set googlemap  marker
Merge branch 'develop' into Allen_Branch
fix marker lable