Uppdaterad deadlock detection
Merge branch 'boxset' of https://github.com/Sebelino/Team18v2 into boxset