some merge fixes
Merge branch 'feature/queueAssignButton' of https://github.com/qNinja/qNinja into feature/queueAssignButton