salary on mypage implemented and admin schedule now works
merge