moved "Chosen" building multi-select code into format_location_filter method so it functions properly
fix SPOT-991
Merge branch 'Chosen'

Conflicts:
	static/js/desktop.js
Merge branch 'master' of github.com:uw-it-aca/spacescout_web

Conflicts:
	static/js/global.js
Merge remote-tracking branch 'origin/multi_select'