workstation switch
Merge branch 'framework4' of github.com:the-spiller/Midway into framework4

Conflicts:
	Midway/App_Data/cm.sdf
	Midway/scripts/pages/search.js
	Midway/scripts/pages/search_phase_1.js