Updated map view, added icons
Merge branch 'master' of github.com:elliottwilliams/wearmeat