Gemfile changes for Rails 4.0.3
controller tests 3->4 refactoring
notes update
notes update
resolved rails_4 merge conflict