updated controllers and models
Merge pull request #1 from ClickClickkOnSal/set_up

updated controllers and models