Updated controllers.
Merge branch 'master' of https://github.com/Team-Grapefruit-Web-Services/Grapefruit-Note