Fixed bug with listeners
Merge branch 'dev' of ssh://git@github.com/Farenhajt/Lidkoping-SH.git into dev