Merge branch 'master' of https://github.com/SkyBirdSoar/StaffManager.git