Add controller methods
Merge branch 'master' into controllers
Finish app