samll fix
Merge branch 'dev'
finished half
move mapObj to whole
nothing
Merge branch 'dev' of github.com:VectorWinner/Map
Merge branch 'master' into dev