sidebar static mockup and icons
Merge branch 'master' of github.com:beak-lab/swell

Conflicts:
	app/scripts/modules/challenge/app.js