Dev

Fixing a Y offset issue when drawing a route and updating a non-unicode datastore batch to dev branch