version 2.0
Merge https://github.com/roshbotics/realtime

Conflicts: