Merge branch 'master' of https://github.com/FarmBot/OpenFarm into style-tiles
Starting to add announcements for #212
The problem with files
Pulled in master
And then suddenly it worked, still need to do tests before merge
Merge stage_option_serializer, add tests to announcement, add is_permanent to announcement
Response to hound
Updates to image uploading
Merge branch 'master' of https://github.com/FarmBot/OpenFarm into rickcarlino-master
Merge branch 'master' of https://github.com/FarmBot/OpenFarm into announcements
Move announcements out of API
Merge pull request #222 from simonv3/rickcarlino-master

More If statements in the template
remove skip_before action
Merge branch 'master' of https://github.com/FarmBot/OpenFarm into style-tiles
Some overdue style updates. Fixed alert boxes covering each other
Merge pull request #223 from simonv3/style-tiles

Style tiles
Merge branch 'master' of github.com:FarmBot/OpenFarm
merge conflicts