No luck attempts to fix problems in notes_controller_spec
Merge remote-tracking branch 'origin/master'