Complete styling for picture-add.
Merge branch 'photo-upload-in-toolbox'

Conflicts:
	app/styles/feed.css
	app/views/index.html
	app/views/partials/main.html