Pre driving time production commit
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merged fixed toggle and zinnia changes from dev instance.
Fixes for Zinnia URLs, settings, header template
Added add_river stub to Rivers/views