map tiles working
Re-factored loading of app
Merge branch 'map-tiles' into dev