Update Gemfile with annotate gem
Run bundle install
Merge branch 'Configuration' into modeling-users