Merge branch 'Lucas-branch'
Filler image while the map loads

See above
Merge branch 'master' into Lucas-branch
stuff