Fixed pupil and company delete
Merge branch 'master' of github.com:SaSDBG/SaS-Control-Center