Added and fixed message handling.
Merge branch 'development' of https://github.com/hesselmeulenbeld/HUniversal-Production-Utrecht into development