Design
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	css/dockPanel.css
	css/dockPanel.less
	index.html