Merge branch 'master' of /home/afro/Projekt/innovativeproject-lostsignal with conflicts.
signal + maps