changed map scroll
Merge branch 'master' into ltolias