Move collapse map tab into mapRegion div

* Move the collapse map button
* Fix styling
* Redo collapse map js
Fix workspace-menu's JS show/hide
Merge branch 'move-collapse-map'

Conflicts:
	css/global.css
Merge remote-tracking branch 'origin/master' into app-sync-ui-sep-16

Conflicts:
	css/global.css
Fix js-content classes on new workspace menu sections
Add clearfix to headerRegion in topbar css
Merge branch 'app-sync-ui-sep-16'

Conflicts:
	css/global.css