First try of correcting RBC contact information
Revert "First try of correcting RBC contact information"

This reverts commit b7616121d9794b94f0be6b126990810e8e945a06.
Bug fix on Guid handling (by Lolo)
Merge branch 'OpenETCS/master'