Merge branch 'refs/heads/master' into status_controller
Merge branch 'status_controller' of https://github.com/Matrickage/eDetailingProjectControl into status_controller