Fix setting panes over existing panes, and setting a pane that was set before
Merge branch 'fixSetPane' into deployment

* fixSetPane:
  Fix setting panes over existing panes, and setting a pane that was set before

Conflicts:
	pane-switcher.js