Reordered code to keep consistent format.
Merge remote-tracking branch 'origin/master'
Updated RealTimeDisplay to include a river monitor.
Merge remote-tracking branch 'origin/master'