Merge pull request #6 from eanplatter/master

Fixed queue view
Fixes mentor status
Merge pull request #6 from joverall22/master

Fixed mentor status