More work to make the dev site function properly
Merge branch 'framework4' of github.com:the-spiller/Midway into framework4

Conflicts:
	Midway/Notes.txt