new marker and map parser
new parsing
Merge remote-tracking branch 'github/my_update' into develop
Merge branch 'develop' into maps
maps 1