First batch of work for refactoring everything to Architect
Fixes for architect.
Refactor should be more or less fully done, just needs testing.
More fixes for architect version
Manually merged @robru's #164 here
Apply master patch manually
Merge remote-tracking branch 'origin/master' into architect

Conflicts:
	app/config/all
	app/js/editor.js
Merge pull request #166 from zedapp/architect

Work in progress: architect refactoring