very minor changes, to demo the slideshow interface.  Changes will ultimately be over-written by experimental branch
Propogating bug fixes to development branch
merging some bug fixes (and the ebays sensor data upload code) from prod to master
Added ability to pull in MapBox tilesets
Merge branch 'experimental'
Resolved conflicts (I think)
Conflicts:
	apps/account/models/groups.py
	apps/overlays/models/marker.py
	apps/prints/dynamic/dynamic_model.py
	apps/prints/views/api.py
	apps/templates/base/base.html
	apps/templates/base/iframe.html
	apps/templates/profile/form_data.html
	apps/uploads/managers.py
	apps/uploads/views/api.py
	static/scripts/helpers/mapTypes.js
	userdata/README.md