Conflicts: app/controllers/admin/mailer_controller.rb app/controllers/notes_controller.rb
Controllers refactoring with contexts Move commit compare logic to model