resolve conflict
resolve conflict
resolve conflict
resolve conflict
Revert "resolve conflict"

This reverts commit 5f8661bdec5410beb1526ac6cd98c7865418d8d7.
Working Movement Receiver
Merge branch 'master' of https://github.com/Trollhammaren/pts-esd-carsystem.git