not sure
Merge branch 'master' of https://github.com/IMAmuseum/ChicagoCodeX

Conflicts:
	frontend/js/oscitk/views/FiguresView.js