Merge pull request #363 from rickcarlino/master

Syncronous image processing on staging
Move edit flow to new design
Tweaks to ensure image uploading works, adding specs
Tweaks
Merge branch 'master' of https://github.com/openfarmcc/OpenFarm into edit-guides
New favicon for web, iOS, Windows, etc
Respond to the hound
Missed one
Merge pull request #366 from warpling/favicon

New favicon for web, iOS, Windows, etc
Merge branch 'master' of https://github.com/openfarmcc/OpenFarm into edit-guides
Bump to Head, and remove print statement from stages_concern
Made links references to links
Merge pull request #367 from simonv3/master

Made links references to links
Copy tweak, removing extra button
First round of test coverage increase
Tests up to speed for relevant things
Add todo, run tests, merge with master
Responses to the hound
Merge pull request #365 from simonv3/edit-guides

Close #340. Move edit guide flow to use same as Guide Creation
Merge branch 'master' of https://github.com/openfarmcc/OpenFarm