Merge pull request #71 from CAPS-Robotics/dev

Merge in editcheckbuttons
Merge branch 'dev'
Hotfix non-admins getting invalid results when editing directory
Hotfix non admins being able to edit hours