Merge toolbox with pic-picker & maps broken.
Merge now correct.
Merge of master & toolbox now correct.
Complete styling for picture-add.
Merge branch 'master' of https://github.com/tcb-hr/feed

Conflicts:
	app/scripts/controllers/main.js
Merge branch 'master' of https://github.com/tcb-hr/feed

Conflicts:
	app/scripts/controllers/main.js
	app/views/partials/main.html
	app/views/partials/navbar.html
	bower.json
Resolving merge conflict in nav.
Resolution of merge conflict in main.
Merge branch 'photo-upload-in-toolbox'

Conflicts:
	app/styles/feed.css
	app/views/index.html
	app/views/partials/main.html
Merge pull request #24 from janaspage/master

Merging in photo-uploader contained in toolbox.