i
Merge branch 'traveller' of https://github.com/00stefan00/ITACT_GetConnected into traveller
Error messages now both languages
Errors working and head conflicts erased