Merge branch 'map-tile-server'
Merge branch 'master' of github.com:Trott/developer.ucsf.edu