Fix Nonetype Bug
Merge branch 'master' of https://github.com/SixTrack/SixDesk