added dotenv to prod
Refactored shifts controller
Merged from master
Made nesting more visual in Shifts controller. Great refactor