Map view won't be resetted each time leaving the map
Merge branch 'master' into game