Update  mapview
Merge branch 'jl'
Update map
Merge branch 'master' of github.com:CanTireInnovations/treads
Merge branch 'jl'

Conflicts:
	server/api/controllers/TrailController.js