working scrolling
Merge branch 'feature/scroll' into feature/slim

Conflicts:
	client/app/js/app/photos/react.coffee
icons