Pull Request (Dev_1.1)

Project Course
please do not redirect in the model po, it should be done in controller.