Merge branch 'Lucas-branch'
A change

safsfs
Merge branch 'master' into Lucas-branch
Page now gets coordinates before loading map

See above