Implemented configuration file for output displays
Moved all other output display types
Merge remote-tracking branch 'origin/master' into ildipo/issue-840

Conflicts:
	core/src/main/web/app/mainapp/mainapp.js
Merge pull request #842 from twosigma/ildipo/issue-840

Ildipo/issue 840