fix broken main-panel view
Merge remote-tracking branch 'origin/master'

Conflicts:
	master.js