OO Sidebar
Cleaning up how we're generating sidebar links
JSBEAUTIFY
Allowing for nested menus
Merge branch 'master' into toolbar
Merge branch 'toolbar' into merge_master_sake_bomb

Conflicts:
	app/templates/_marketplace_sidebar.hbs
Fixing navigation and broken tables