Merge branch 'master' of https://github.com/Henrikjm/Sanntid

Conflicts:
	src/queue/queue.go
faktard