Changed how tile layers in maps are handled
Merge branch 'master' of git@github.com:zarokima/MastersProject.git