updated sidebar entites - seems to have broken.
Merge branch 'master' of github.com:beak-lab/swell

Conflicts:
	app/scripts/modules/sidebar/entities/sidebar.js