Merge branch 'master' of https://github.com/cassidyhouse/CassidyApp

Conflicts:
app/controllers/application_controller.rb
merge conflict