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
Merge remote-tracking branch 'balanced/master_sake_bomb' into merge_master_sake_bomb

Conflicts:
	app/templates/_marketplace_sidebar.hbs
Merge pull request #1280 from cohitre/merge_master_sake_bomb

Tables and sidebar fixes.