diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 68360907..235a5038 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,12 +1,12 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-05-06 17:45:40 +0530 using RuboCop version 0.48.1.
+# on 2017-07-12 14:56:54 +0000 using RuboCop version 0.49.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 13
+# Offense count: 15
 # Cop supports --auto-correct.
 # Configuration parameters: Include, TreatCommentsAsGroupSeparators.
 # Include: **/Gemfile, **/gems.rb
@@ -14,21 +14,289 @@ Bundler/OrderedGems:
   Exclude:
     - 'Gemfile'
 
-# Offense count: 29
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
+# SupportedStyles: with_first_parameter, with_fixed_indentation
+Layout/AlignParameters:
+  Exclude:
+    - 'Vagrantfile'
+
+# Offense count: 9
+# Cop supports --auto-correct.
+Layout/ClosingParenthesisIndentation:
+  Exclude:
+    - 'app/controllers/conference_registrations_controller.rb'
+    - 'spec/support/omniauth_macros.rb'
+
+# Offense count: 14
+# Cop supports --auto-correct.
+Layout/CommentIndentation:
+  Exclude:
+    - 'app/controllers/admin/comments_controller.rb'
+    - 'app/controllers/admin/difficulty_levels_controller.rb'
+    - 'app/models/conference.rb'
+    - 'app/models/program.rb'
+    - 'app/models/track.rb'
+    - 'spec/features/volunteers_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Layout/ElseAlignment:
+  Exclude:
+    - 'app/helpers/format_helper.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Layout/EmptyLineAfterMagicComment:
+  Exclude:
+    - 'spec/models/conference_spec.rb'
+
+# Offense count: 103
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: empty_lines, no_empty_lines
+Layout/EmptyLinesAroundBlockBody:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Layout/EmptyLinesAroundExceptionHandlingKeywords:
+  Exclude:
+    - 'app/models/payment.rb'
+
+# Offense count: 9
+# Cop supports --auto-correct.
+# Configuration parameters: AllowForAlignment, ForceEqualSignAlignment.
+Layout/ExtraSpacing:
+  Exclude:
+    - 'Guardfile'
+    - 'app/controllers/application_controller.rb'
+    - 'config.ru'
+    - 'db/migrate/20140623101032_create_ahoy_events.rb'
+    - 'db/migrate/20140701123203_add_events_per_week_to_conference.rb'
+    - 'db/migrate/20140719160903_create_delayed_jobs.rb'
+    - 'spec/models/conference_spec.rb'
+
+# Offense count: 42
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
+# SupportedStyles: consistent, special_for_inner_method_call, special_for_inner_method_call_in_parentheses
+Layout/FirstParameterIndentation:
+  Enabled: false
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
+# SupportedStyles: special_inside_parentheses, consistent, align_brackets
+Layout/IndentArray:
+  Exclude:
+    - 'app/models/conference.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: IndentationWidth.
+Layout/IndentAssignment:
+  Exclude:
+    - 'app/helpers/format_helper.rb'
+    - 'app/models/conference.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
+# SupportedStyles: special_inside_parentheses, consistent, align_braces
+Layout/IndentHash:
+  Exclude:
+    - 'app/models/user.rb'
+    - 'db/migrate/20140701123203_add_events_per_week_to_conference.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: normal, rails
+Layout/IndentationConsistency:
+  Exclude:
+    - 'app/controllers/users_controller.rb'
+    - 'app/models/event.rb'
+    - 'spec/controllers/subscriptions_controller_spec.rb'
+
+# Offense count: 7
+# Cop supports --auto-correct.
+# Configuration parameters: Width, IgnoredPatterns.
+Layout/IndentationWidth:
+  Exclude:
+    - 'app/helpers/format_helper.rb'
+    - 'app/serializers/conference_serializer.rb'
+    - 'db/migrate/20140701123203_add_events_per_week_to_conference.rb'
+    - 'lib/tasks/demo_data_for_development.rake'
+    - 'spec/models/ability_spec.rb'
+
+# Offense count: 4
+# Cop supports --auto-correct.
+Layout/LeadingCommentSpace:
+  Exclude:
+    - 'Guardfile'
+    - 'app/models/comment.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: symmetrical, new_line, same_line
+Layout/MultilineArrayBraceLayout:
+  Exclude:
+    - 'app/controllers/conference_registrations_controller.rb'
+
+# Offense count: 5
+# Cop supports --auto-correct.
+Layout/MultilineBlockLayout:
+  Exclude:
+    - 'app/serializers/conference_serializer.rb'
+
+# Offense count: 6
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: symmetrical, new_line, same_line
+Layout/MultilineHashBraceLayout:
+  Exclude:
+    - 'app/serializers/conference_serializer.rb'
+    - 'spec/models/event_spec.rb'
+
+# Offense count: 40
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: symmetrical, new_line, same_line
+Layout/MultilineMethodCallBraceLayout:
+  Enabled: false
+
+# Offense count: 55
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
+# SupportedStyles: aligned, indented, indented_relative_to_receiver
+Layout/MultilineMethodCallIndentation:
+  Enabled: false
+
+# Offense count: 27
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
+# SupportedStyles: aligned, indented
+Layout/MultilineOperationIndentation:
+  Exclude:
+    - 'app/controllers/admin/events_controller.rb'
+    - 'app/controllers/application_controller.rb'
+    - 'app/models/ability.rb'
+    - 'app/models/conference.rb'
+    - 'app/models/event.rb'
+    - 'db/migrate/20140701123203_add_events_per_week_to_conference.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Layout/SpaceAfterComma:
+  Exclude:
+    - 'lib/tasks/data_demo.rake'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: space, no_space
+Layout/SpaceAroundEqualsInParameterDefault:
+  Exclude:
+    - 'app/helpers/format_helper.rb'
+    - 'app/models/event.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: AllowForAlignment.
+Layout/SpaceAroundOperators:
+  Exclude:
+    - 'lib/tasks/data.rake'
+
+# Offense count: 343
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: space, no_space
+Layout/SpaceBeforeBlockBraces:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Layout/SpaceBeforeComma:
+  Exclude:
+    - 'lib/tasks/data_demo.rake'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Layout/SpaceBeforeSemicolon:
+  Exclude:
+    - 'Guardfile'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Layout/SpaceInsideArrayPercentLiteral:
+  Exclude:
+    - 'spec/models/ability_spec.rb'
+
+# Offense count: 68
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SupportedStylesForEmptyBraces, SpaceBeforeBlockParameters.
+# SupportedStyles: space, no_space
+# SupportedStylesForEmptyBraces: space, no_space
+Layout/SpaceInsideBlockBraces:
+  Exclude:
+    - 'app/controllers/admin/comments_controller.rb'
+    - 'app/controllers/admin/events_controller.rb'
+    - 'app/controllers/admin/questions_controller.rb'
+    - 'app/helpers/application_helper.rb'
+    - 'app/models/program.rb'
+    - 'app/models/ticket.rb'
+    - 'app/models/user.rb'
+    - 'lib/tasks/events_registrations.rake'
+    - 'spec/controllers/admin/event_schedules_controller_spec.rb'
+    - 'spec/controllers/admin/schedules_controller_spec.rb'
+    - 'spec/features/splashpage_spec.rb'
+    - 'spec/models/ability_spec.rb'
+    - 'spec/models/user_spec.rb'
+
+# Offense count: 25
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SupportedStylesForEmptyBraces.
+# SupportedStyles: space, no_space, compact
+# SupportedStylesForEmptyBraces: space, no_space
+Layout/SpaceInsideHashLiteralBraces:
+  Exclude:
+    - 'app/controllers/admin/conferences_controller.rb'
+    - 'app/controllers/api/v1/speakers_controller.rb'
+    - 'app/models/ability.rb'
+    - 'app/models/conference.rb'
+    - 'app/models/event_type.rb'
+    - 'app/models/user.rb'
+    - 'spec/models/event_spec.rb'
+    - 'spec/models/payment_spec.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Layout/SpaceInsidePercentLiteralDelimiters:
+  Exclude:
+    - 'Gemfile'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: final_newline, final_blank_line
+Layout/TrailingBlankLines:
+  Exclude:
+    - 'lib/tasks/event_attatchments.rake'
+    - 'lib/tasks/roles.rake'
+
+# Offense count: 13
 Lint/AmbiguousBlockAssociation:
   Exclude:
-    - 'app/models/comment.rb'
-    - 'app/models/event.rb'
-    - 'app/models/event_schedule.rb'
-    - 'app/models/ticket_purchase.rb'
-    - 'app/models/user.rb'
     - 'spec/controllers/admin/conferences_controller_spec.rb'
     - 'spec/controllers/admin/event_schedules_controller_spec.rb'
     - 'spec/controllers/admin/registration_periods_controller_spec.rb'
+    - 'spec/controllers/admin/users_controller_spec.rb'
     - 'spec/controllers/proposals_controller_spec.rb'
     - 'spec/controllers/schedules_controller_spec.rb'
     - 'spec/models/user_spec.rb'
-    - 'spec/controllers/admin/users_controller_spec.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
@@ -57,192 +325,40 @@ Lint/UnusedBlockArgument:
   Exclude:
     - 'lib/tasks/user.rake'
 
-# Offense count: 108
+# Offense count: 112
 Metrics/AbcSize:
-  Max: 75
-  Exclude:
-    - 'app/controllers/admin/conferences_controller.rb'
+  Max: 86
 
-# Offense count: 202
+# Offense count: 222
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/BlockLength:
-  Max: 487
+  Max: 471
 
 # Offense count: 21
 Metrics/CyclomaticComplexity:
   Max: 12
 
-# Offense count: 1991
+# Offense count: 2224
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:
   Max: 619
 
-# Offense count: 115
+# Offense count: 116
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 56
 
-# Offense count: 2
+# Offense count: 3
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
-  Max: 472
-  Exclude:
-    - 'app/helpers/application_helper.rb'
+  Max: 159
 
-
-# Offense count: 14
+# Offense count: 15
 Metrics/PerceivedComplexity:
   Max: 15
 
-# Offense count: 11
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, Include.
-# SupportedStyles: action, filter
-# Include: app/controllers/**/*.rb
-Rails/ActionFilter:
-  Exclude:
-    - 'app/controllers/admin/base_controller.rb'
-    - 'app/controllers/admin/registrations_controller.rb'
-    - 'app/controllers/application_controller.rb'
-    - 'app/controllers/conference_registrations_controller.rb'
-    - 'app/controllers/subscriptions_controller.rb'
-    - 'app/controllers/ticket_purchases_controller.rb'
-    - 'app/controllers/tickets_controller.rb'
-    - 'app/controllers/users/omniauth_callbacks_controller.rb'
-
-# Offense count: 7
-# Cop supports --auto-correct.
-# Configuration parameters: NilOrEmpty, NotPresent, UnlessPresent.
-Rails/Blank:
-  Exclude:
-    - 'app/models/program.rb'
-    - 'app/models/user.rb'
-    - 'spec/factories/event_schedule.rb'
-
-# Offense count: 139
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: strict, flexible
-Rails/Date:
-  Enabled: false
-
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: Whitelist.
-# Whitelist: find_by_sql
-Rails/DynamicFindBy:
-  Exclude:
-    - 'app/controllers/admin/events_controller.rb'
-    - 'db/migrate/20140701123203_add_events_per_week_to_conference.rb'
-
-# Offense count: 4
-Rails/FilePath:
-  Exclude:
-    - 'spec/features/lodgings_spec.rb'
-    - 'spec/features/sponsor_spec.rb'
-    - 'spec/spec_helper.rb'
-
-# Offense count: 6
-# Cop supports --auto-correct.
-# Configuration parameters: Include.
-# Include: app/models/**/*.rb
-Rails/FindBy:
-  Exclude:
-    - 'app/models/conference.rb'
-    - 'app/models/event.rb'
-    - 'app/models/openid.rb'
-    - 'app/models/ticket_purchase.rb'
-    - 'app/models/user.rb'
-
-# Offense count: 7
-# Configuration parameters: Include.
-# Include: app/models/**/*.rb
-Rails/HasAndBelongsToMany:
-  Exclude:
-    - 'app/models/conference.rb'
-    - 'app/models/qanswer.rb'
-    - 'app/models/question.rb'
-    - 'app/models/registration.rb'
-    - 'app/models/vchoice.rb'
-
-# Offense count: 170
-# Cop supports --auto-correct.
-# Configuration parameters: Include.
-# Include: spec/**/*, test/**/*
-Rails/HttpPositionalArguments:
-  Enabled: false
-
-# Offense count: 2
-Rails/OutputSafety:
-  Exclude:
-    - 'app/helpers/format_helper.rb'
-    - 'app/models/commercial.rb'
-    - 'app/helpers/application_helper.rb'
-
-# Offense count: 10
-# Cop supports --auto-correct.
-Rails/PluralizationGrammar:
-  Exclude:
-    - 'spec/models/conference_spec.rb'
-
-# Offense count: 22
-# Cop supports --auto-correct.
-# Configuration parameters: NotNilAndNotEmpty, NotBlank, UnlessBlank.
-Rails/Present:
-  Exclude:
-    - 'app/helpers/users_helper.rb'
-    - 'app/models/campaign.rb'
-    - 'app/models/cfp.rb'
-    - 'app/models/email_settings.rb'
-    - 'app/models/event.rb'
-    - 'app/models/program.rb'
-    - 'app/models/venue.rb'
-
-# Offense count: 52
-# Configuration parameters: Include.
-# Include: db/migrate/*.rb
-Rails/ReversibleMigration:
-  Exclude:
-    - 'db/migrate/20140530082708_remove_color_defaults.rb'
-    - 'db/migrate/20140605125153_update_event_states.rb'
-    - 'db/migrate/20140610173021_change_person_id_to_user_id_in_registrations.rb'
-    - 'db/migrate/20140611123926_change_person_id_to_user_id_in_votes.rb'
-    - 'db/migrate/20140623150541_drop_person_and_event_person_tables.rb'
-    - 'db/migrate/20140731165107_move_conference_contact_details_to_contact.rb'
-    - 'db/migrate/20140801164901_move_conference_media_to_commercial.rb'
-    - 'db/migrate/20140801170430_move_event_media_to_commercial.rb'
-    - 'db/migrate/20140820093735_migrating_supporter_registrations_to_ticket_users.rb'
-    - 'db/migrate/20140821103643_split_ticket_price_in_price_and_currency.rb'
-    - 'db/migrate/20140825093132_move_splashpage_attributes_from_conference_to_splashpage.rb'
-    - 'db/migrate/20140930092923_move_sponsor_email_to_contact.rb'
-    - 'db/migrate/20141117222919_drop_splash_descriptions_and_photo.rb'
-    - 'db/migrate/20141130182139_drop_table_event_attachments.rb'
-
-# Offense count: 5
-# Configuration parameters: Blacklist.
-# Blacklist: decrement!, decrement_counter, increment!, increment_counter, toggle!, touch, update_all, update_attribute, update_column, update_columns, update_counters
-Rails/SkipsModelValidations:
-  Exclude:
-    - 'app/controllers/payments_controller.rb'
-    - 'app/models/revision_observer.rb'
-    - 'db/migrate/20140730104658_migrate_roles_for_cancancan.rb'
-    - 'lib/tasks/user.rake'
-
-# Offense count: 46
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: strict, flexible
-Rails/TimeZone:
-  Exclude:
-    - 'app/models/comment.rb'
-    - 'app/models/conference.rb'
-    - 'lib/tasks/dump_db.rake'
-    - 'spec/controllers/admin/comments_controller_spec.rb'
-    - 'spec/controllers/admin/programs_controller_spec.rb'
-    - 'spec/factories/users.rb'
-    - 'spec/models/campaign_spec.rb'
-    - 'spec/models/conference_spec.rb'
-
-# Offense count: 18
+# Offense count: 20
 Style/AccessorMethodName:
   Exclude:
     - 'app/controllers/admin/events_controller.rb'
@@ -254,33 +370,17 @@ Style/AccessorMethodName:
 
 # Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
-# SupportedStyles: with_first_parameter, with_fixed_indentation
-Style/AlignParameters:
-  Exclude:
-    - 'Vagrantfile'
-
-# Offense count: 2
-# Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: is_a?, kind_of?
 Style/ClassCheck:
   Exclude:
     - 'app/models/email_settings.rb'
-    - 'app/models/revision_observer.rb'
 
 # Offense count: 1
 Style/ClassVars:
   Exclude:
     - 'spec/support/kneet_connections.rb'
 
-# Offense count: 9
-# Cop supports --auto-correct.
-Style/ClosingParenthesisIndentation:
-  Exclude:
-    - 'app/controllers/conference_registrations_controller.rb'
-    - 'spec/support/omniauth_macros.rb'
-
 # Offense count: 2
 # Cop supports --auto-correct.
 Style/ColonMethodCall:
@@ -288,42 +388,20 @@ Style/ColonMethodCall:
     - 'app/models/commercial.rb'
     - 'app/models/contact.rb'
 
-# Offense count: 14
-# Cop supports --auto-correct.
-Style/CommentIndentation:
-  Exclude:
-    - 'app/controllers/admin/comments_controller.rb'
-    - 'app/controllers/admin/difficulty_levels_controller.rb'
-    - 'app/models/conference.rb'
-    - 'app/models/program.rb'
-    - 'app/models/track.rb'
-    - 'spec/features/volunteers_spec.rb'
-
 # Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, SingleLineConditionsOnly, IncludeTernaryExpressions.
 # SupportedStyles: assign_to_condition, assign_inside_condition
 Style/ConditionalAssignment:
   Exclude:
-    - 'app/controllers/admin/volunteers_controller.rb'
-    - 'app/controllers/conference_registrations_controller.rb'
     - 'app/helpers/format_helper.rb'
-    - 'app/models/conference.rb'
-    - 'app/models/ticket_purchase.rb'
-    - 'app/models/user.rb'
     - 'db/migrate/20140610165551_migrate_data_person_to_user.rb'
     - 'db/migrate/20140820124117_undo_wrong_migration20140801080705_add_users_to_events.rb'
 
-# Offense count: 436
+# Offense count: 461
 Style/Documentation:
   Enabled: false
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/ElseAlignment:
-  Exclude:
-    - 'app/helpers/format_helper.rb'
-
 # Offense count: 2
 # Cop supports --auto-correct.
 Style/EmptyCaseCondition:
@@ -331,25 +409,6 @@ Style/EmptyCaseCondition:
     - 'app/helpers/format_helper.rb'
     - 'app/helpers/versions_helper.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/EmptyLineAfterMagicComment:
-  Exclude:
-    - 'spec/models/conference_spec.rb'
-
-# Offense count: 109
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: empty_lines, no_empty_lines
-Style/EmptyLinesAroundBlockBody:
-  Enabled: false
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/EmptyLinesAroundExceptionHandlingKeywords:
-  Exclude:
-    - 'app/models/payment.rb'
-
 # Offense count: 1
 # Cop supports --auto-correct.
 Style/EmptyLiteral:
@@ -371,34 +430,15 @@ Style/EmptyMethod:
     - 'db/migrate/20130206192339_rename_attending_social_events_with_partner.rb'
     - 'db/migrate/20130216122155_set_registration_defaults_to_false.rb'
 
-# Offense count: 9
-# Cop supports --auto-correct.
-# Configuration parameters: AllowForAlignment, ForceEqualSignAlignment.
-Style/ExtraSpacing:
-  Exclude:
-    - 'Guardfile'
-    - 'app/controllers/application_controller.rb'
-    - 'config.ru'
-    - 'db/migrate/20140623101032_create_ahoy_events.rb'
-    - 'db/migrate/20140701123203_add_events_per_week_to_conference.rb'
-    - 'db/migrate/20140719160903_create_delayed_jobs.rb'
-    - 'spec/models/conference_spec.rb'
-
-# Offense count: 2
+# Offense count: 3
 # Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts, AllowedAcronyms.
 # AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
 Style/FileName:
   Exclude:
     - 'Gemfile'
+    - 'Guardfile'
     - 'Vagrantfile'
 
-# Offense count: 42
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
-# SupportedStyles: consistent, special_for_inner_method_call, special_for_inner_method_call_in_parentheses
-Style/FirstParameterIndentation:
-  Enabled: false
-
 # Offense count: 23
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
@@ -432,59 +472,6 @@ Style/IfUnlessModifier:
     - 'spec/controllers/admin/conferences_controller_spec.rb'
     - 'spec/support/flash.rb'
 
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
-# SupportedStyles: special_inside_parentheses, consistent, align_brackets
-Style/IndentArray:
-  Exclude:
-    - 'app/models/conference.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: IndentationWidth.
-Style/IndentAssignment:
-  Exclude:
-    - 'app/helpers/format_helper.rb'
-    - 'app/models/conference.rb'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
-# SupportedStyles: special_inside_parentheses, consistent, align_braces
-Style/IndentHash:
-  Exclude:
-    - 'app/models/user.rb'
-    - 'db/migrate/20140701123203_add_events_per_week_to_conference.rb'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: normal, rails
-Style/IndentationConsistency:
-  Exclude:
-    - 'app/controllers/users_controller.rb'
-    - 'app/models/event.rb'
-    - 'spec/controllers/subscriptions_controller_spec.rb'
-
-# Offense count: 6
-# Cop supports --auto-correct.
-# Configuration parameters: Width, IgnoredPatterns.
-Style/IndentationWidth:
-  Exclude:
-    - 'app/helpers/format_helper.rb'
-    - 'app/serializers/conference_serializer.rb'
-    - 'db/migrate/20140701123203_add_events_per_week_to_conference.rb'
-    - 'lib/tasks/demo_data_for_development.rake'
-    - 'spec/models/ability_spec.rb'
-
-# Offense count: 4
-# Cop supports --auto-correct.
-Style/LeadingCommentSpace:
-  Exclude:
-    - 'Guardfile'
-    - 'app/models/comment.rb'
-
 # Offense count: 8
 # Cop supports --auto-correct.
 Style/LineEndConcatenation:
@@ -503,29 +490,6 @@ Style/MethodDefParentheses:
     - 'app/models/user.rb'
     - 'lib/tasks/demo_data_for_development.rake'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: symmetrical, new_line, same_line
-Style/MultilineArrayBraceLayout:
-  Exclude:
-    - 'app/controllers/conference_registrations_controller.rb'
-
-# Offense count: 5
-# Cop supports --auto-correct.
-Style/MultilineBlockLayout:
-  Exclude:
-    - 'app/serializers/conference_serializer.rb'
-
-# Offense count: 6
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: symmetrical, new_line, same_line
-Style/MultilineHashBraceLayout:
-  Exclude:
-    - 'app/serializers/conference_serializer.rb'
-    - 'spec/models/event_spec.rb'
-
 # Offense count: 7
 # Cop supports --auto-correct.
 Style/MultilineIfModifier:
@@ -536,33 +500,6 @@ Style/MultilineIfModifier:
     - 'app/models/event.rb'
     - 'app/models/registration_period.rb'
 
-# Offense count: 40
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: symmetrical, new_line, same_line
-Style/MultilineMethodCallBraceLayout:
-  Enabled: false
-
-# Offense count: 55
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
-# SupportedStyles: aligned, indented, indented_relative_to_receiver
-Style/MultilineMethodCallIndentation:
-  Enabled: false
-
-# Offense count: 27
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
-# SupportedStyles: aligned, indented
-Style/MultilineOperationIndentation:
-  Exclude:
-    - 'app/controllers/admin/events_controller.rb'
-    - 'app/controllers/application_controller.rb'
-    - 'app/models/ability.rb'
-    - 'app/models/conference.rb'
-    - 'app/models/event.rb'
-    - 'db/migrate/20140701123203_add_events_per_week_to_conference.rb'
-
 # Offense count: 2
 # Cop supports --auto-correct.
 Style/MutableConstant:
@@ -631,7 +568,7 @@ Style/ParenthesesAroundCondition:
     - 'app/controllers/application_controller.rb'
     - 'app/helpers/format_helper.rb'
 
-# Offense count: 17
+# Offense count: 18
 # Cop supports --auto-correct.
 # Configuration parameters: PreferredDelimiters.
 Style/PercentLiteralDelimiters:
@@ -639,13 +576,13 @@ Style/PercentLiteralDelimiters:
     - 'Gemfile'
     - 'app/controllers/admin/users_controller.rb'
     - 'app/models/ability.rb'
+    - 'app/models/cfp.rb'
     - 'app/models/comment.rb'
     - 'app/models/commercial.rb'
     - 'app/models/conference.rb'
     - 'app/models/contact.rb'
     - 'app/models/registration.rb'
     - 'app/models/subscription.rb'
-    - 'app/models/cfp.rb'
     - 'app/uploaders/picture_uploader.rb'
     - 'spec/models/ability_spec.rb'
     - 'spec/models/program_spec.rb'
@@ -676,12 +613,6 @@ Style/PreferredHashMethods:
 Style/RaiseArgs:
   EnforcedStyle: compact
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/RedundantBegin:
-  Exclude:
-    - 'app/models/revision_observer.rb'
-
 # Offense count: 1
 # Cop supports --auto-correct.
 Style/RedundantParentheses:
@@ -722,96 +653,6 @@ Style/SingleLineMethods:
   Exclude:
     - 'Guardfile'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/SpaceAfterComma:
-  Exclude:
-    - 'lib/tasks/data_demo.rake'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: space, no_space
-Style/SpaceAroundEqualsInParameterDefault:
-  Exclude:
-    - 'app/helpers/format_helper.rb'
-    - 'app/models/event.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: AllowForAlignment.
-Style/SpaceAroundOperators:
-  Exclude:
-    - 'lib/tasks/data.rake'
-
-# Offense count: 319
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: space, no_space
-Style/SpaceBeforeBlockBraces:
-  Enabled: false
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/SpaceBeforeComma:
-  Exclude:
-    - 'lib/tasks/data_demo.rake'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/SpaceBeforeSemicolon:
-  Exclude:
-    - 'Guardfile'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/SpaceInsideArrayPercentLiteral:
-  Exclude:
-    - 'spec/models/ability_spec.rb'
-
-# Offense count: 62
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SupportedStylesForEmptyBraces, SpaceBeforeBlockParameters.
-# SupportedStyles: space, no_space
-# SupportedStylesForEmptyBraces: space, no_space
-Style/SpaceInsideBlockBraces:
-  Exclude:
-    - 'app/controllers/admin/comments_controller.rb'
-    - 'app/controllers/admin/events_controller.rb'
-    - 'app/controllers/admin/questions_controller.rb'
-    - 'app/helpers/application_helper.rb'
-    - 'app/models/program.rb'
-    - 'app/models/ticket.rb'
-    - 'app/models/user.rb'
-    - 'lib/tasks/events_registrations.rake'
-    - 'spec/controllers/admin/event_schedules_controller_spec.rb'
-    - 'spec/controllers/admin/schedules_controller_spec.rb'
-    - 'spec/features/splashpage_spec.rb'
-    - 'spec/models/ability_spec.rb'
-    - 'spec/models/user_spec.rb'
-
-# Offense count: 25
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SupportedStylesForEmptyBraces.
-# SupportedStyles: space, no_space, compact
-# SupportedStylesForEmptyBraces: space, no_space
-Style/SpaceInsideHashLiteralBraces:
-  Exclude:
-    - 'app/controllers/admin/conferences_controller.rb'
-    - 'app/controllers/api/v1/speakers_controller.rb'
-    - 'app/models/ability.rb'
-    - 'app/models/conference.rb'
-    - 'app/models/event_type.rb'
-    - 'app/models/user.rb'
-    - 'spec/models/event_spec.rb'
-    - 'spec/models/payment_spec.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/SpaceInsidePercentLiteralDelimiters:
-  Exclude:
-    - 'Gemfile'
-
 # Offense count: 16
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, ConsistentQuotesInMultiline.
@@ -833,9 +674,9 @@ Style/StringLiteralsInInterpolation:
   Exclude:
     - 'lib/tasks/dump_db.rake'
 
-# Offense count: 60
+# Offense count: 67
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Configuration parameters: EnforcedStyle, MinSize, SupportedStyles.
 # SupportedStyles: percent, brackets
 Style/SymbolArray:
   Enabled: false
@@ -862,15 +703,6 @@ Style/TernaryParentheses:
   Exclude:
     - 'app/helpers/format_helper.rb'
 
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: final_newline, final_blank_line
-Style/TrailingBlankLines:
-  Exclude:
-    - 'lib/tasks/event_attatchments.rake'
-    - 'lib/tasks/roles.rake'
-
 # Offense count: 23
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyleForMultiline, SupportedStylesForMultiline.
@@ -881,12 +713,6 @@ Style/TrailingCommaInLiteral:
     - 'db/migrate/20140701123203_add_events_per_week_to_conference.rb'
     - 'spec/models/conference_spec.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/TrailingWhitespace:
-  Exclude:
-    - 'Gemfile'
-
 # Offense count: 3
 # Cop supports --auto-correct.
 Style/UnneededInterpolation:
diff --git a/Gemfile b/Gemfile
index 1af89f34..46c8731e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -205,7 +205,7 @@ group :development do
   gem 'spring-commands-rspec'
   gem 'haml_lint', '~> 0.24.0'
   # for static code analisys
-  gem 'rubocop', '~> 0.48.1', require: false
+  gem 'rubocop', '~> 0.49.0', require: false
   # as database
   gem 'sqlite3'
   # to open mails
diff --git a/Gemfile.lock b/Gemfile.lock
index 9ea214c2..603c374a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -327,6 +327,7 @@ GEM
       activerecord (>= 3.0, < 6.0)
       activesupport (>= 3.0, < 6.0)
       request_store (~> 1.1)
+    parallel (1.11.2)
     parser (2.4.0.0)
       ast (~> 2.2)
     pdf-core (0.2.5)
@@ -457,7 +458,8 @@ GEM
       rspec-mocks (~> 3.0.0)
       rspec-support (~> 3.0.0)
     rspec-support (3.0.2)
-    rubocop (0.48.1)
+    rubocop (0.49.1)
+      parallel (~> 1.10)
       parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
@@ -525,7 +527,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.2)
-    unicode-display_width (1.2.1)
+    unicode-display_width (1.3.0)
     unicode_utils (1.4.0)
     unobtrusive_flash (3.1.0)
       railties
@@ -638,7 +640,7 @@ DEPENDENCIES
   rqrcode
   rspec-activemodel-mocks
   rspec-rails
-  rubocop (~> 0.48.1)
+  rubocop (~> 0.49.0)
   ruby-oembed
   sass-rails (>= 4.0.2)
   selectize-rails
diff --git a/Guardfile b/Guardfile
index 3f92b1a3..017194c9 100644
--- a/Guardfile
+++ b/Guardfile
@@ -1,5 +1,3 @@
-#!/usr/bin/ruby
-#
 # More info at https://github.com/guard/guard#readme
 
 guard_opts = {
diff --git a/Rakefile b/Rakefile
index f29eb6f1..8f92ec18 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,4 +1,3 @@
-#!/usr/bin/env rake
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
diff --git a/app/controllers/admin/volunteers_controller.rb b/app/controllers/admin/volunteers_controller.rb
index e8676bae..aefa682a 100644
--- a/app/controllers/admin/volunteers_controller.rb
+++ b/app/controllers/admin/volunteers_controller.rb
@@ -13,11 +13,11 @@ module Admin
 
     def show
       if can_manage_volunteers?(@conference)
-        if @conference.use_vpositions
-          @volunteers = @conference.registrations.joins(:vchoices).uniq
-        else
-          @volunteers = @conference.registrations.where(volunteer: true)
-        end
+        @volunteers = if @conference.use_vpositions
+                        @conference.registrations.joins(:vchoices).uniq
+                      else
+                        @conference.registrations.where(volunteer: true)
+                      end
       else
         authorize! :index, :volunteer
       end
diff --git a/app/controllers/conference_registrations_controller.rb b/app/controllers/conference_registrations_controller.rb
index c229440e..c2037318 100644
--- a/app/controllers/conference_registrations_controller.rb
+++ b/app/controllers/conference_registrations_controller.rb
@@ -38,12 +38,12 @@ class ConferenceRegistrationsController < ApplicationController
   def create
     @registration = @conference.registrations.new(registration_params)
 
-    if current_user.nil?
-      # @user variable needs to be set so that _sign_up_form_embedded works properly
-      @user = @registration.build_user(user_params)
-    else
-      @user = current_user
-    end
+    @user = if current_user.nil?
+              # @user variable needs to be set so that _sign_up_form_embedded works properly
+              @registration.build_user(user_params)
+            else
+              current_user
+            end
 
     @registration.user = @user
     authorize! :create, @registration
diff --git a/app/models/conference.rb b/app/models/conference.rb
index 68cdc186..db6b4745 100644
--- a/app/models/conference.rb
+++ b/app/models/conference.rb
@@ -563,11 +563,11 @@ class Conference < ActiveRecord::Base
   # ====Returns
   # * +hash+ -> track => {color, value}
   def tracks_distribution(state = nil)
-    if state
-      tracks_grouped = program.events.select(:track_id).where('state = ?', state).group(:track_id)
-    else
-      tracks_grouped = program.events.select(:track_id).group(:track_id)
-    end
+    tracks_grouped = if state
+                       program.events.select(:track_id).where('state = ?', state).group(:track_id)
+                     else
+                       program.events.select(:track_id).group(:track_id)
+                     end
     tracks_counted = tracks_grouped.count
 
     calculate_track_distribution_hash(tracks_grouped, tracks_counted)
@@ -1001,11 +1001,11 @@ class Conference < ActiveRecord::Base
   # ====Returns
   # * +hash+ -> object_type => {color, value}
   def calculate_event_distribution(group_by_id, association_symbol, state = nil)
-    if state
-      grouped = program.events.select(group_by_id).where('state = ?', 'confirmed').group(group_by_id)
-    else
-      grouped = program.events.select(group_by_id).group(group_by_id)
-    end
+    grouped = if state
+                program.events.select(group_by_id).where('state = ?', 'confirmed').group(group_by_id)
+              else
+                program.events.select(group_by_id).group(group_by_id)
+              end
     counted = grouped.count
 
     calculate_distribution_hash(grouped, counted, association_symbol)
diff --git a/app/models/ticket_purchase.rb b/app/models/ticket_purchase.rb
index 88e1f4de..a19678a7 100644
--- a/app/models/ticket_purchase.rb
+++ b/app/models/ticket_purchase.rb
@@ -29,11 +29,11 @@ class TicketPurchase < ActiveRecord::Base
       conference.tickets.each do |ticket|
         quantity = purchases[ticket.id.to_s].to_i
         # if the user bought the ticket and is still unpaid, just update the quantity
-        if ticket.bought?(user) && ticket.unpaid?(user)
-          purchase = update_quantity(conference, quantity, ticket, user)
-        else
-          purchase = purchase_ticket(conference, quantity, ticket, user)
-        end
+        purchase = if ticket.bought?(user) && ticket.unpaid?(user)
+                     update_quantity(conference, quantity, ticket, user)
+                   else
+                     purchase_ticket(conference, quantity, ticket, user)
+                   end
 
         if purchase && !purchase.save
           errors.push(purchase.errors.full_messages)
diff --git a/app/models/user.rb b/app/models/user.rb
index 6ffb739f..5de6a7d4 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -30,13 +30,13 @@ class User < ActiveRecord::Base
   # :lockable, :timeoutable and :omniauthable
   devise_modules = []
 
-  if ENV['OSEM_ICHAIN_ENABLED'] == 'true'
-    devise_modules += [:ichain_authenticatable, :ichain_registerable, :omniauthable, omniauth_providers: []]
-  else
-    devise_modules += [:database_authenticatable, :registerable,
+  devise_modules += if ENV['OSEM_ICHAIN_ENABLED'] == 'true'
+                      [:ichain_authenticatable, :ichain_registerable, :omniauthable, omniauth_providers: []]
+                    else
+                      [:database_authenticatable, :registerable,
                        :recoverable, :rememberable, :trackable, :validatable, :confirmable,
                        :omniauthable, omniauth_providers: [:suse, :google, :facebook, :github]]
-  end
+                    end
 
   devise(*devise_modules)
 
diff --git a/spec/controllers/admin/roles_controller_spec.rb b/spec/controllers/admin/roles_controller_spec.rb
index 964346ef..d5cdc67e 100644
--- a/spec/controllers/admin/roles_controller_spec.rb
+++ b/spec/controllers/admin/roles_controller_spec.rb
@@ -55,7 +55,7 @@ describe Admin::RolesController do
   end
 
   describe 'POST #toggle' do
-    before:each do
+    before :each do
       sign_in admin
       post :toggle_user, conference_id: conference.short_title,
                          user: { email: 'user1@osem.io' },