diff --git a/.rubocop.yml b/.rubocop.yml
new file mode 100644
index 000000000..be2d522a4
--- /dev/null
+++ b/.rubocop.yml
@@ -0,0 +1,56 @@
+inherit_from: .rubocop_todo.yml
+
+AllCops:
+  Include:
+    - '**/Rakefile'
+    - '**/config.ru'
+  Exclude:
+    - 'db/**/*'
+    - 'config/**/*'
+    - 'script/**/*'
+  TargetRubyVersion: 2.3
+
+Rails:
+  Enabled: true
+
+Documentation:
+  Enabled: false
+
+Metrics/LineLength:
+  Max: 140
+
+Style/IndentationConsistency:
+  EnforcedStyle: rails
+
+Style/StringLiterals:
+  Enabled: false
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Style/PercentLiteralDelimiters:
+  Enabled: false
+
+Style/EmptyLinesAroundClassBody:
+  Enabled: false
+
+Style/EmptyLinesAroundBlockBody:
+  Enabled: false
+
+Style/EmptyLinesAroundModuleBody:
+  Enabled: false
+
+Style/SpaceBeforeBlockBraces:
+  Enabled: false
+
+Style/SpaceInsideBrackets:
+  Enabled: false
+
+Style/SpaceInsideHashLiteralBraces:
+  Enabled: false
+
+Style/SpaceInsideBlockBraces:
+  Enabled: false
+
+Style/TrailingBlankLines:
+  Enabled: false
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
new file mode 100644
index 000000000..443782795
--- /dev/null
+++ b/.rubocop_todo.yml
@@ -0,0 +1,838 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2016-11-25 13:34:56 +0100 using RuboCop version 0.45.0.
+# 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: 3
+Lint/AmbiguousRegexpLiteral:
+  Exclude:
+    - 'app/helpers/verification_helper.rb'
+    - 'spec/features/verification/residence_spec.rb'
+
+# Offense count: 3
+# Configuration parameters: AllowSafeAssignment.
+Lint/AssignmentInCondition:
+  Exclude:
+    - 'app/controllers/management/sessions_controller.rb'
+    - 'app/models/notification.rb'
+    - 'lib/capistrano/template.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: AlignWith, SupportedStyles.
+# SupportedStyles: either, start_of_block, start_of_line
+Lint/BlockAlignment:
+  Exclude:
+    - 'spec/features/tracks_spec.rb'
+    - 'spec/models/proposal_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: AlignWith, SupportedStyles, AutoCorrect.
+# SupportedStyles: start_of_line, def
+Lint/DefEndAlignment:
+  Exclude:
+    - 'app/controllers/comments_controller.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: runtime_error, standard_error
+Lint/InheritException:
+  Exclude:
+    - 'app/controllers/concerns/feature_flags.rb'
+
+# Offense count: 7
+Lint/NestedMethodDefinition:
+  Exclude:
+    - 'lib/acts_as_paranoid_aliases.rb'
+
+# Offense count: 13
+Lint/ParenthesesAsGroupedExpression:
+  Exclude:
+    - 'spec/features/admin/organizations_spec.rb'
+    - 'spec/features/debates_spec.rb'
+    - 'spec/features/proposals_spec.rb'
+    - 'spec/models/debate_spec.rb'
+
+# Offense count: 1
+Lint/UnderscorePrefixedVariableName:
+  Exclude:
+    - 'lib/manager_authenticator.rb'
+
+# Offense count: 4
+# Cop supports --auto-correct.
+# Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
+Lint/UnusedBlockArgument:
+  Exclude:
+    - 'app/controllers/admin/spending_proposals_controller.rb'
+    - 'app/models/ahoy/data_source.rb'
+    - 'spec/spec_helper.rb'
+
+# Offense count: 5
+# Cop supports --auto-correct.
+# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods.
+Lint/UnusedMethodArgument:
+  Exclude:
+    - 'app/controllers/organizations/registrations_controller.rb'
+    - 'app/controllers/users/omniauth_callbacks_controller.rb'
+    - 'app/controllers/users/registrations_controller.rb'
+    - 'app/models/abilities/everyone.rb'
+    - 'app/models/abilities/valuator.rb'
+
+# Offense count: 135
+Lint/UselessAssignment:
+  Enabled: false
+
+# Offense count: 41
+Metrics/AbcSize:
+  Max: 44
+
+# Offense count: 4
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 205
+
+# Offense count: 5
+Metrics/CyclomaticComplexity:
+  Max: 8
+
+# Offense count: 52
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 307
+
+# Offense count: 28
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 38
+
+# Offense count: 2
+# Configuration parameters: CountComments.
+Metrics/ModuleLength:
+  Max: 193
+
+# Offense count: 3
+Metrics/PerceivedComplexity:
+  Max: 11
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Performance/RedundantBlockCall:
+  Exclude:
+    - 'app/mailers/mailer.rb'
+
+# Offense count: 4
+# Cop supports --auto-correct.
+Performance/RedundantMatch:
+  Exclude:
+    - 'app/controllers/valuation/spending_proposals_controller.rb'
+    - 'app/helpers/embed_videos_helper.rb'
+
+# Offense count: 2
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: strict, flexible
+Rails/Date:
+  Exclude:
+    - 'app/controllers/concerns/commentable_actions.rb'
+    - 'app/models/direct_message.rb'
+
+# Offense count: 4
+# Cop supports --auto-correct.
+# Configuration parameters: Whitelist.
+# Whitelist: find_by_sql
+Rails/DynamicFindBy:
+  Exclude:
+    - 'app/controllers/users/confirmations_controller.rb'
+    - 'app/controllers/users/registrations_controller.rb'
+    - 'spec/features/management/users_spec.rb'
+
+# Offense count: 4
+# Cop supports --auto-correct.
+# Configuration parameters: Include.
+# Include: app/models/**/*.rb
+Rails/FindBy:
+  Exclude:
+    - 'app/models/setting.rb'
+    - 'app/models/verification/email.rb'
+    - 'app/models/verification/management/email.rb'
+    - 'app/models/verification/residence.rb'
+
+# Offense count: 24
+# Cop supports --auto-correct.
+# Configuration parameters: Include.
+# Include: spec/**/*, test/**/*
+Rails/HttpPositionalArguments:
+  Exclude:
+    - 'spec/controllers/admin/api/stats_controller_spec.rb'
+    - 'spec/controllers/concerns/has_filters_spec.rb'
+    - 'spec/controllers/concerns/has_orders_spec.rb'
+    - 'spec/controllers/debates_controller_spec.rb'
+    - 'spec/controllers/management/sessions_controller_spec.rb'
+    - 'spec/controllers/pages_controller_spec.rb'
+    - 'spec/controllers/users/registrations_controller_spec.rb'
+
+# Offense count: 12
+Rails/OutputSafety:
+  Exclude:
+    - 'app/controllers/spending_proposals_controller.rb'
+    - 'app/helpers/application_helper.rb'
+    - 'app/helpers/text_with_links_helper.rb'
+    - 'app/helpers/users_helper.rb'
+    - 'app/helpers/valuation_helper.rb'
+
+# Offense count: 6
+# Cop supports --auto-correct.
+Rails/PluralizationGrammar:
+  Exclude:
+    - 'spec/features/admin/banners_spec.rb'
+    - 'spec/features/debates_spec.rb'
+    - 'spec/features/proposals_spec.rb'
+    - 'spec/models/residence_spec.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: referer, referrer
+Rails/RequestReferer:
+  Exclude:
+    - 'app/controllers/users/sessions_controller.rb'
+
+# Offense count: 11
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: strict, flexible
+Rails/TimeZone:
+  Exclude:
+    - 'lib/score_calculator.rb'
+    - 'spec/controllers/admin/api/stats_controller_spec.rb'
+    - 'spec/models/ahoy/data_source_spec.rb'
+
+# Offense count: 7
+# Cop supports --auto-correct.
+# Configuration parameters: Include.
+# Include: app/models/**/*.rb
+Rails/Validation:
+  Exclude:
+    - 'app/models/comment.rb'
+    - 'app/models/spending_proposal.rb'
+    - 'app/models/verification/residence.rb'
+    - 'app/models/verification/sms.rb'
+
+# Offense count: 9
+Style/AccessorMethodName:
+  Exclude:
+    - 'app/controllers/application_controller.rb'
+    - 'app/controllers/concerns/commentable_actions.rb'
+    - 'app/controllers/management/proposals_controller.rb'
+    - 'app/controllers/management/spending_proposals_controller.rb'
+    - 'app/controllers/proposals_controller.rb'
+
+# Offense count: 30
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle, SupportedLastArgumentHashStyles.
+# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
+Style/AlignHash:
+  Exclude:
+    - 'spec/features/admin/banners_spec.rb'
+
+# Offense count: 21
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
+# SupportedStyles: with_first_parameter, with_fixed_indentation
+Style/AlignParameters:
+  Exclude:
+    - 'app/helpers/search_helper.rb'
+    - 'app/models/verification/management/email.rb'
+    - 'bin/rspec'
+    - 'bin/spring'
+    - 'spec/features/admin/spending_proposals_spec.rb'
+    - 'spec/features/spending_proposals_spec.rb'
+    - 'spec/features/valuation/spending_proposals_spec.rb'
+    - 'spec/features/verification/verified_user_spec.rb'
+    - 'spec/i18n_spec.rb'
+    - 'spec/models/user_spec.rb'
+    - 'spec/rails_helper.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: always, conditionals
+Style/AndOr:
+  Exclude:
+    - 'app/helpers/embed_videos_helper.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods.
+# SupportedStyles: line_count_based, semantic, braces_for_chaining
+# ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
+# FunctionalMethods: let, let!, subject, watch
+# IgnoredMethods: lambda, proc, it
+Style/BlockDelimiters:
+  Exclude:
+    - 'spec/features/users_auth_spec.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/BlockEndNewline:
+  Exclude:
+    - 'app/models/banner.rb'
+    - 'spec/features/users_auth_spec.rb'
+
+# Offense count: 19
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: braces, no_braces, context_dependent
+Style/BracesAroundHashParameters:
+  Exclude:
+    - 'app/controllers/valuation/spending_proposals_controller.rb'
+    - 'app/models/concerns/searchable.rb'
+    - 'app/models/verification/residence.rb'
+    - 'lib/manager_authenticator.rb'
+    - 'spec/controllers/management/users_controller_spec.rb'
+    - 'spec/features/admin/spending_proposals_spec.rb'
+    - 'spec/lib/manager_authenticator_spec.rb'
+    - 'spec/models/residence_spec.rb'
+    - 'spec/models/user_spec.rb'
+
+# Offense count: 57
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: nested, compact
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+# Offense count: 5
+Style/ClassVars:
+  Exclude:
+    - 'app/models/concerns/measurable.rb'
+    - 'app/models/organization.rb'
+    - 'app/models/user.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/ClosingParenthesisIndentation:
+  Exclude:
+    - 'spec/rails_helper.rb'
+
+# Offense count: 4
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, SingleLineConditionsOnly.
+# SupportedStyles: assign_to_condition, assign_inside_condition
+Style/ConditionalAssignment:
+  Exclude:
+    - 'app/controllers/comments_controller.rb'
+    - 'app/controllers/management/spending_proposals_controller.rb'
+    - 'app/controllers/spending_proposals_controller.rb'
+    - 'app/controllers/verification/sms_controller.rb'
+
+# Offense count: 6
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: leading, trailing
+Style/DotPosition:
+  Exclude:
+    - 'app/models/banner.rb'
+    - 'app/models/tag_cloud.rb'
+    - 'app/models/verification/management/managed_user.rb'
+
+# Offense count: 1
+Style/DoubleNegation:
+  Exclude:
+    - 'app/models/flag.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/EmptyCaseCondition:
+  Exclude:
+    - 'app/models/concerns/verification.rb'
+
+# Offense count: 9
+# Cop supports --auto-correct.
+Style/EmptyLines:
+  Exclude:
+    - 'app/models/concerns/search_cache.rb'
+    - 'app/models/notification.rb'
+    - 'spec/features/admin/spending_proposals_spec.rb'
+    - 'spec/features/admin/verifications_spec.rb'
+    - 'spec/features/debates_spec.rb'
+    - 'spec/features/registration_form_spec.rb'
+    - 'spec/features/users_auth_spec.rb'
+    - 'spec/features/verification/verified_user_spec.rb'
+    - 'spec/support/verifiable.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/EmptyLinesAroundAccessModifier:
+  Exclude:
+    - 'app/controllers/users_controller.rb'
+
+# Offense count: 29
+# Cop supports --auto-correct.
+# Configuration parameters: AllowForAlignment, ForceEqualSignAlignment.
+Style/ExtraSpacing:
+  Enabled: false
+
+# Offense count: 1
+# 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:
+  Exclude:
+    - 'app/controllers/users_controller.rb'
+
+# Offense count: 32
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+  Enabled: false
+
+# Offense count: 10
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
+# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
+Style/HashSyntax:
+  Exclude:
+    - 'lib/sms_api.rb'
+    - 'spec/factories.rb'
+
+# Offense count: 6
+# Cop supports --auto-correct.
+# Configuration parameters: MaxLineLength.
+Style/IfUnlessModifier:
+  Exclude:
+    - 'app/controllers/annotations_controller.rb'
+    - 'app/controllers/verification/letter_controller.rb'
+    - 'app/controllers/welcome_controller.rb'
+    - 'app/helpers/embed_videos_helper.rb'
+    - 'app/models/proposal.rb'
+    - 'app/models/spending_proposal.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: SupportedStyles, IndentationWidth.
+# SupportedStyles: special_inside_parentheses, consistent, align_brackets
+Style/IndentArray:
+  EnforcedStyle: consistent
+
+# Offense count: 4
+# Cop supports --auto-correct.
+# Configuration parameters: SupportedStyles, IndentationWidth.
+# SupportedStyles: special_inside_parentheses, consistent, align_braces
+Style/IndentHash:
+  EnforcedStyle: consistent
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: normal, rails
+Style/IndentationConsistency:
+  Exclude:
+    - 'spec/features/tracks_spec.rb'
+    - 'spec/models/proposal_spec.rb'
+
+# Offense count: 11
+# Cop supports --auto-correct.
+# Configuration parameters: Width.
+Style/IndentationWidth:
+  Exclude:
+    - 'app/controllers/annotations_controller.rb'
+    - 'app/helpers/flags_helper.rb'
+    - 'app/mailers/devise_mailer.rb'
+    - 'app/mailers/mailer.rb'
+    - 'app/models/ahoy/data_source.rb'
+    - 'app/models/comment_notifier.rb'
+    - 'app/models/concerns/search_cache.rb'
+    - 'spec/features/comments/proposals_spec.rb'
+    - 'spec/features/moderation/users_spec.rb'
+    - 'spec/features/tracks_spec.rb'
+    - 'spec/features/verification/verified_user_spec.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: line_count_dependent, lambda, literal
+Style/Lambda:
+  Exclude:
+    - 'app/models/banner.rb'
+    - 'app/models/direct_message.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/MethodCallParentheses:
+  Exclude:
+    - 'app/controllers/management/document_verifications_controller.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: require_parentheses, require_no_parentheses, require_no_parentheses_except_multiline
+Style/MethodDefParentheses:
+  Exclude:
+    - 'spec/helpers/comments_helper_spec.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: symmetrical, new_line, same_line
+Style/MultilineArrayBraceLayout:
+  Exclude:
+    - 'app/controllers/valuation/spending_proposals_controller.rb'
+    - 'app/helpers/search_helper.rb'
+
+# Offense count: 1
+Style/MultilineBlockChain:
+  Exclude:
+    - 'app/controllers/valuation/spending_proposals_controller.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/MultilineBlockLayout:
+  Exclude:
+    - 'app/models/banner.rb'
+    - 'spec/features/users_auth_spec.rb'
+
+# Offense count: 6
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: symmetrical, new_line, same_line
+Style/MultilineHashBraceLayout:
+  Exclude:
+    - 'app/controllers/valuation/spending_proposals_controller.rb'
+    - 'app/models/debate.rb'
+    - 'app/models/proposal.rb'
+    - 'app/models/spending_proposal.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/MultilineIfThen:
+  Exclude:
+    - 'app/controllers/management/users_controller.rb'
+    - 'lib/census_api.rb'
+
+# Offense count: 6
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: symmetrical, new_line, same_line
+Style/MultilineMethodCallBraceLayout:
+  Exclude:
+    - 'app/controllers/users_controller.rb'
+    - 'app/models/comment.rb'
+    - 'app/models/organization.rb'
+    - 'app/models/user.rb'
+    - 'spec/rails_helper.rb'
+
+# Offense count: 33
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
+# SupportedStyles: aligned, indented, indented_relative_to_receiver
+Style/MultilineMethodCallIndentation:
+  Exclude:
+    - 'app/models/banner.rb'
+    - 'app/models/tag_cloud.rb'
+    - 'app/models/verification/management/managed_user.rb'
+    - 'spec/models/comment_spec.rb'
+    - 'spec/models/debate_spec.rb'
+    - 'spec/models/proposal_spec.rb'
+    - 'spec/models/user_spec.rb'
+
+# Offense count: 5
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
+# SupportedStyles: aligned, indented
+Style/MultilineOperationIndentation:
+  Exclude:
+    - 'app/helpers/users_helper.rb'
+    - 'app/helpers/valuation_helper.rb'
+    - 'app/models/verification/letter.rb'
+
+# Offense count: 5
+# Cop supports --auto-correct.
+Style/MutableConstant:
+  Exclude:
+    - 'app/models/activity.rb'
+    - 'app/models/proposal.rb'
+    - 'lib/tag_sanitizer.rb'
+    - 'lib/wysiwyg_sanitizer.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/NegatedIf:
+  Exclude:
+    - 'spec/spec_helper.rb'
+
+# Offense count: 17
+# Cop supports --auto-correct.
+Style/NestedParenthesizedCalls:
+  Exclude:
+    - 'spec/features/debates_spec.rb'
+    - 'spec/features/valuation/spending_proposals_spec.rb'
+    - 'spec/helpers/settings_helper_spec.rb'
+    - 'spec/helpers/verification_helper_spec.rb'
+
+# Offense count: 12
+# Cop supports --auto-correct.
+Style/NumericLiterals:
+  MinDigits: 9
+
+# Offense count: 19
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, EnforcedStyle, SupportedStyles.
+# SupportedStyles: predicate, comparison
+Style/NumericPredicate:
+  Exclude:
+    - 'spec/**/*'
+    - 'app/controllers/users_controller.rb'
+    - 'app/controllers/valuation/spending_proposals_controller.rb'
+    - 'app/helpers/banners_helper.rb'
+    - 'app/helpers/debates_helper.rb'
+    - 'app/helpers/votes_helper.rb'
+    - 'app/models/concerns/conflictable.rb'
+    - 'app/models/concerns/taggable.rb'
+    - 'app/models/concerns/verification.rb'
+    - 'app/models/debate.rb'
+    - 'app/models/lock.rb'
+    - 'app/models/user.rb'
+    - 'app/models/verification/management/email.rb'
+    - 'lib/score_calculator.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/ParallelAssignment:
+  Exclude:
+    - 'lib/active_model/dates.rb'
+    - 'spec/support/common_actions.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: AllowSafeAssignment.
+Style/ParenthesesAroundCondition:
+  Exclude:
+    - 'app/controllers/proposals_controller.rb'
+    - 'app/models/debate.rb'
+    - 'app/models/proposal.rb'
+
+# Offense count: 6
+# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
+# NamePrefix: is_, has_, have_
+# NamePrefixBlacklist: is_, has_, have_
+# NameWhitelist: is_a?
+Style/PredicateName:
+  Exclude:
+    - 'spec/**/*'
+    - 'app/controllers/concerns/has_filters.rb'
+    - 'app/controllers/concerns/has_orders.rb'
+    - 'app/helpers/banners_helper.rb'
+    - 'app/helpers/debates_helper.rb'
+    - 'app/models/user.rb'
+    - 'lib/census_api.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: compact, exploded
+Style/RaiseArgs:
+  Exclude:
+    - 'app/controllers/management/base_controller.rb'
+    - 'app/controllers/users/omniauth_callbacks_controller.rb'
+    - 'app/controllers/valuation/spending_proposals_controller.rb'
+
+# Offense count: 16
+# Cop supports --auto-correct.
+Style/RedundantParentheses:
+  Exclude:
+    - 'app/controllers/admin/settings_controller.rb'
+    - 'app/helpers/proposals_helper.rb'
+    - 'spec/features/admin/organizations_spec.rb'
+    - 'spec/features/debates_spec.rb'
+    - 'spec/features/proposals_spec.rb'
+    - 'spec/models/debate_spec.rb'
+
+# Offense count: 5
+# Cop supports --auto-correct.
+# Configuration parameters: AllowMultipleReturnValues.
+Style/RedundantReturn:
+  Exclude:
+    - 'app/models/ahoy/data_source.rb'
+    - 'app/models/verification/management/document.rb'
+    - 'lib/capistrano/template.rb'
+    - 'lib/census_api.rb'
+
+# Offense count: 49
+# Cop supports --auto-correct.
+Style/RedundantSelf:
+  Enabled: false
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
+# SupportedStyles: slashes, percent_r, mixed
+Style/RegexpLiteral:
+  Exclude:
+    - 'app/helpers/embed_videos_helper.rb'
+    - 'spec/customization_engine_spec.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/RescueModifier:
+  Exclude:
+    - 'app/controllers/concerns/commentable_actions.rb'
+    - 'app/controllers/verification/sms_controller.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/SpaceAfterColon:
+  Exclude:
+    - 'spec/models/user_spec.rb'
+
+# Offense count: 14
+# Cop supports --auto-correct.
+Style/SpaceAfterComma:
+  Exclude:
+    - 'app/models/ahoy/data_source.rb'
+    - 'app/models/banner.rb'
+    - 'app/models/concerns/search_cache.rb'
+    - 'app/models/concerns/taggable.rb'
+    - 'app/models/spending_proposal.rb'
+    - 'app/models/user.rb'
+    - 'spec/features/valuation/spending_proposals_spec.rb'
+    - 'spec/lib/census_api_spec.rb'
+    - 'spec/models/abilities/moderator_spec.rb'
+    - 'spec/models/verification/management/email_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/SpaceAfterNot:
+  Exclude:
+    - 'app/models/flag.rb'
+
+# Offense count: 20
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: space, no_space
+Style/SpaceAroundEqualsInParameterDefault:
+  Exclude:
+    - 'app/helpers/cache_keys_helper.rb'
+    - 'app/helpers/proposals_helper.rb'
+    - 'app/helpers/spending_proposals_helper.rb'
+    - 'app/helpers/stats_helper.rb'
+    - 'app/helpers/tracks_helper.rb'
+    - 'app/helpers/valuation_helper.rb'
+    - 'app/mailers/devise_mailer.rb'
+    - 'app/models/comment.rb'
+    - 'app/models/tag_cloud.rb'
+    - 'app/models/verification/residence.rb'
+    - 'lib/acts_as_paranoid_aliases.rb'
+    - 'lib/capistrano/template.rb'
+    - 'lib/census_api.rb'
+    - 'lib/manager_authenticator.rb'
+    - 'spec/support/common_actions.rb'
+
+# Offense count: 66
+# Cop supports --auto-correct.
+# Configuration parameters: AllowForAlignment.
+Style/SpaceAroundOperators:
+  Enabled: false
+
+# Offense count: 6
+# Cop supports --auto-correct.
+Style/SpaceBeforeComma:
+  Exclude:
+    - 'app/models/proposal.rb'
+    - 'spec/controllers/management/sessions_controller_spec.rb'
+    - 'spec/controllers/management/users_controller_spec.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: AllowForAlignment.
+Style/SpaceBeforeFirstArg:
+  Exclude:
+    - 'spec/factories.rb'
+
+# Offense count: 9
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: require_no_space, require_space
+Style/SpaceInLambdaLiteral:
+  Exclude:
+    - 'app/models/concerns/filterable.rb'
+    - 'app/models/spending_proposal.rb'
+    - 'app/models/user.rb'
+    - 'app/models/verified_user.rb'
+
+# Offense count: 8
+# Cop supports --auto-correct.
+Style/SpaceInsideParens:
+  Exclude:
+    - 'app/models/user.rb'
+    - 'lib/manager_authenticator.rb'
+    - 'spec/features/proposals_spec.rb'
+    - 'spec/models/abilities/moderator_spec.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/SpaceInsidePercentLiteralDelimiters:
+  Exclude:
+    - 'app/models/activity.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: single_quotes, double_quotes
+Style/StringLiteralsInInterpolation:
+  Exclude:
+    - 'app/controllers/stats_controller.rb'
+    - 'app/models/proposal.rb'
+
+# Offense count: 9
+# Cop supports --auto-correct.
+# Configuration parameters: IgnoredMethods.
+# IgnoredMethods: respond_to, define_method
+Style/SymbolProc:
+  Exclude:
+    - 'app/controllers/admin/settings_controller.rb'
+    - 'app/controllers/notifications_controller.rb'
+    - 'app/controllers/organizations/registrations_controller.rb'
+    - 'lib/manager_authenticator.rb'
+    - 'spec/factories.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/TrailingWhitespace:
+  Exclude:
+    - 'app/controllers/admin/api/stats_controller.rb'
+
+# Offense count: 31
+# Cop supports --auto-correct.
+Style/UnneededInterpolation:
+  Exclude:
+    - 'app/controllers/users/omniauth_callbacks_controller.rb'
+    - 'spec/factories.rb'
+    - 'spec/features/campaigns_spec.rb'
+    - 'spec/features/management/managed_users_spec.rb'
+    - 'spec/features/management/proposals_spec.rb'
+    - 'spec/features/management/spending_proposals_spec.rb'
+    - 'spec/models/residence_spec.rb'
+    - 'spec/models/spending_proposal_spec.rb'
+
+# Offense count: 13
+# Configuration parameters: SupportedStyles.
+# SupportedStyles: snake_case, normalcase, non_integer
+Style/VariableNumber:
+  EnforcedStyle: normalcase
+
+# Offense count: 9
+# Cop supports --auto-correct.
+# Configuration parameters: SupportedStyles, WordRegex.
+# SupportedStyles: percent, brackets
+Style/WordArray:
+  EnforcedStyle: percent
+  MinSize: 3
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/ZeroLengthPredicate:
+  Exclude:
+    - 'app/models/concerns/verification.rb'
diff --git a/.ruby-version b/.ruby-version
index a6254504e..e7034819f 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.3.1
\ No newline at end of file
+2.3.2
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index a45f36990..54460ab58 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,9 +2,13 @@ language: ruby
 addons:
   postgresql: "9.4"
 rvm:
- - "2.2.3"
+ - "2.3.2"
 cache: bundler
 before_script:
   - "for i in config/*.example; do cp \"$i\" \"${i/.example}\"; done"
   - bundle exec rake db:setup
-script: bundle exec rake
+script:
+  - "bundle exec rake knapsack:rspec"
+env:
+  - CI_NODE_TOTAL=2 CI_NODE_INDEX=0
+  - CI_NODE_TOTAL=2 CI_NODE_INDEX=1
\ No newline at end of file
diff --git a/CONTRIBUTING_EN.md b/CONTRIBUTING_EN.md
index 0c322d506..17f93bc63 100644
--- a/CONTRIBUTING_EN.md
+++ b/CONTRIBUTING_EN.md
@@ -34,6 +34,16 @@ If you want to contribute code to solve an issue:
 * Follow these [best practices](https://github.com/styleguide/ruby)
 * Open a *pull request* to the main repository describing what issue you are addressing.
 
+## Cleaning up
+
+In the rush of time sometimes things get messy, you can help us cleaning things up:
+
+* implement [pending specs](https://travis-ci.org/consul/consul)
+* increase [code coverage](https://coveralls.io/github/consul/consul?branch=master)
+* improve [code quality](https://codeclimate.com/github/consul/consul)
+* update [dependencies](https://gemnasium.com/consul/consul)
+* make [code consistent](https://github.com/bbatsov/rubocop)
+
 ## Other ways of contributing without coding
 
 * If you think there's a feature missing, or find a bug, create an issue (make sure it has not already been reported).
diff --git a/CONTRIBUTING_ES.md b/CONTRIBUTING_ES.md
index 7a8d10877..aaee9ec92 100644
--- a/CONTRIBUTING_ES.md
+++ b/CONTRIBUTING_ES.md
@@ -34,6 +34,16 @@ Cuando quieras resolver una incidencia mediante código:
 * Sigue estas [buenas prácticas](https://github.com/styleguide/ruby)
 * Envía una *pull request* al repositorio principal indicando la incidencia que se está arreglando
 
+## Limpiar
+
+En la urgencia del momento, las cosas a veces se ensucian, puedes ayudarnos a limpiar la casa:
+
+* implementando [tests pendientes](https://travis-ci.org/consul/consul)
+* incrementando la [cobertura de tests](https://coveralls.io/github/consul/consul?branch=master)
+* mejorando la [calidad del código](https://codeclimate.com/github/consul/consul)
+* actualizando [dependecias](https://gemnasium.com/consul/consul)
+* haciendo el [código consistente](https://github.com/bbatsov/rubocop)
+
 ## Otras formas de contribuir sin código
 
 * Si crees que hay una funcionalidad que hace falta, o descubres un problema, abre una incidencia (asegúrate de que
diff --git a/CUSTOMIZE_ES.md b/CUSTOMIZE_ES.md
index 71c3701e4..f7af01649 100644
--- a/CUSTOMIZE_ES.md
+++ b/CUSTOMIZE_ES.md
@@ -1,8 +1,8 @@
 # Personalización
 
-Puedes modificar consul y ponerle tu propia imagen, para esto debes primero hacer un fork de https://github.com/consul/consul creando un repositorio nuevo en Github. Puedes usar otro servicio como Gitlab, pero no te olvides de poner el enlace en el footer a tu repositorio en cumplimiento con la licencia de este proyecto (GPL Affero 3). 
+Puedes modificar consul y ponerle tu propia imagen, para esto debes primero hacer un fork de https://github.com/consul/consul creando un repositorio nuevo en Github. Puedes usar otro servicio como Gitlab, pero no te olvides de poner el enlace en el footer a tu repositorio en cumplimiento con la licencia de este proyecto (GPL Affero 3).
 
-Hemos creado una estructura específica donde puedes sobreescribir y personalizar la aplicación para que puedas actualizar sin que tengas problemas al hacer merge y se sobreescriban por error tus cambios. Intentamos que Consul sea una aplicación Ruby on Rails lo más plain vanilla posible para facilitar el acceso de nuevas desarrolladoras. 
+Hemos creado una estructura específica donde puedes sobreescribir y personalizar la aplicación para que puedas actualizar sin que tengas problemas al hacer merge y se sobreescriban por error tus cambios. Intentamos que Consul sea una aplicación Ruby on Rails lo más plain vanilla posible para facilitar el acceso de nuevas desarrolladoras.
 
 ## Ficheros y directorios especiales
 
@@ -21,16 +21,16 @@ Aparte de estos directorios también cuentas con ciertos ficheros para:
 * Gemfile_custom
 * config/application.custom.rb
 
-### Internacionalización 
+### Internacionalización
 
-Si quieres modificar algún texto de la web deberías encontrarlos en los ficheros formato YML disponibles en *config/locales/*. Puedes leer la [guía de internacionalización](http://guides.rubyonrails.org/i18n.html) de Ruby on Rails sobre como funciona este sistema. 
+Si quieres modificar algún texto de la web deberías encontrarlos en los ficheros formato YML disponibles en *config/locales/*. Puedes leer la [guía de internacionalización](http://guides.rubyonrails.org/i18n.html) de Ruby on Rails sobre como funciona este sistema.
 
-Las adaptaciones los debes poner en el directorio *config/locales/custom/*, recomendamos poner solo los textos que quieras personalizar. Por ejemplo si quieres personalizar el texto de "Ayuntamiento de Madrid, 2016" que se encuentra en el footer en todas las páginas, primero debemos ubicar en que plantilla se encuentra (app/views/layouts/_footer.html.erb), vemos que en el código pone lo siguiente: 
+Las adaptaciones los debes poner en el directorio *config/locales/custom/*, recomendamos poner solo los textos que quieras personalizar. Por ejemplo si quieres personalizar el texto de "Ayuntamiento de Madrid, 2016" que se encuentra en el footer en todas las páginas, primero debemos ubicar en que plantilla se encuentra (app/views/layouts/_footer.html.erb), vemos que en el código pone lo siguiente:
 ```
-<%= t("layouts.footer.copyright", year: Time.now.year) %> 
+<%= t("layouts.footer.copyright", year: Time.current.year) %>
 ```
 
-Y que en el fichero config/locales/es.yml sigue esta estructura (solo ponemos lo relevante para este caso): 
+Y que en el fichero config/locales/es.yml sigue esta estructura (solo ponemos lo relevante para este caso):
 
 ```
 es:
@@ -40,11 +40,11 @@ es:
 
 ```
 
-Si creamos el fichero config/locales/custom/es.yml y modificamos "Ayuntamiento de Madrid" por el nombre de la organización que se este haciendo la modificación. Recomendamos directamente copiar los ficheros config/locales/ e ir revisando y corrigiendo las que querramos, borrando las líneas que no querramos traducir. 
+Si creamos el fichero config/locales/custom/es.yml y modificamos "Ayuntamiento de Madrid" por el nombre de la organización que se este haciendo la modificación. Recomendamos directamente copiar los ficheros config/locales/ e ir revisando y corrigiendo las que querramos, borrando las líneas que no querramos traducir.
 
 ### Imágenes
 
-Si quieres sobreescribir alguna imagen debes primero fijarte el nombre que tiene, por defecto se encuentran en *app/assets/images*. Por ejemplo si quieres modificar *app/assets/images/logo_header.png* debes poner otra con ese mismo nombre en el directorio app/assets/images/custom. Los iconos que seguramente quieras modificar son: 
+Si quieres sobreescribir alguna imagen debes primero fijarte el nombre que tiene, por defecto se encuentran en *app/assets/images*. Por ejemplo si quieres modificar *app/assets/images/logo_header.png* debes poner otra con ese mismo nombre en el directorio app/assets/images/custom. Los iconos que seguramente quieras modificar son:
 
 * apple-touch-icon-200.png
 * icon_home.png
@@ -59,7 +59,7 @@ Si quieres modificar el HTML de alguna página puedes hacerlo copiando el HTML d
 
 ### CSS
 
-Si quieres cambiar algun selector CSS (de las hojas de estilo) puedes hacerlo en el fichero *app/assets/stylesheets/custom.scss*. Por ejemplo si quieres cambiar el color del header (.top-links) puedes hacerlo agregando: 
+Si quieres cambiar algun selector CSS (de las hojas de estilo) puedes hacerlo en el fichero *app/assets/stylesheets/custom.scss*. Por ejemplo si quieres cambiar el color del header (.top-links) puedes hacerlo agregando:
 
 ```
 .top-links {
@@ -67,11 +67,11 @@ Si quieres cambiar algun selector CSS (de las hojas de estilo) puedes hacerlo en
 }
 ```
 
-Usamos un preprocesador de CSS, [SASS, con la sintaxis SCSS](http://sass-lang.com/guide). 
+Usamos un preprocesador de CSS, [SASS, con la sintaxis SCSS](http://sass-lang.com/guide).
 
 ### Javascript
 
-Si quieres agregar código Javascript puedes hacerlo en el fichero *app/assets/javascripts/custom.js". Por ejemplo si quieres que salga una alerta puedes poner lo siguiente: 
+Si quieres agregar código Javascript puedes hacerlo en el fichero *app/assets/javascripts/custom.js". Por ejemplo si quieres que salga una alerta puedes poner lo siguiente:
 
 ```
 $(function(){
@@ -81,9 +81,9 @@ $(function(){
 
 ### Modelos
 
-Si quieres agregar modelos nuevos, o modificar o agregar métodos a uno ya existente puedes hacerlo en *app/models/custom*. En el caso de los modelos antiguos debes primero hacer un require de la dependencia. 
+Si quieres agregar modelos nuevos, o modificar o agregar métodos a uno ya existente puedes hacerlo en *app/models/custom*. En el caso de los modelos antiguos debes primero hacer un require de la dependencia.
 
-Por ejemplo en el caso del Ayuntamiento de Madrid se requiere comprobar que el código postal durante la verificación sigue un cierto formato (empieza con 280). Esto se realiza creando este fichero en *app/models/custom/verification/residence.rb*: 
+Por ejemplo en el caso del Ayuntamiento de Madrid se requiere comprobar que el código postal durante la verificación sigue un cierto formato (empieza con 280). Esto se realiza creando este fichero en *app/models/custom/verification/residence.rb*:
 
 ```
 require_dependency Rails.root.join('app', 'models', 'verification', 'residence').to_s
@@ -123,10 +123,10 @@ No olvides poner los tests relevantes en *spec/models/custom*, siguiendo con el
 require 'rails_helper'
 
 describe Verification::Residence do
- 
+
   let(:residence) { build(:verification_residence, document_number: "12345678Z") }
 
-  describe "verification" do 
+  describe "verification" do
 
     describe "postal code" do
       it "should be valid with postal codes starting with 280" do
@@ -162,7 +162,7 @@ TODO
 
 ### Gemfile
 
-Para agregar librerías (gems) nuevas puedes hacerlo en el fichero *Gemfile_custom*. Por ejemplo si quieres agregar la gema [rails-footnotes](https://github.com/josevalim/rails-footnotes) debes hacerlo agregandole 
+Para agregar librerías (gems) nuevas puedes hacerlo en el fichero *Gemfile_custom*. Por ejemplo si quieres agregar la gema [rails-footnotes](https://github.com/josevalim/rails-footnotes) debes hacerlo agregandole
 
 ```
 gem 'rails-footnotes', '~> 4.0'
@@ -170,9 +170,9 @@ gem 'rails-footnotes', '~> 4.0'
 
 Y siguiendo el flujo clásico en Ruby on Rails (bundle install y seguir con los pasos específicos de la gema en la documentación)
 
-### application.rb 
+### application.rb
 
-Cuando necesites extender o modificar el *config/application.rb* puedes hacerlo a través del fichero *config/application_custom.rb*. Por ejemplo si quieres modificar el idioma por defecto al inglés pondrías lo siguiente: 
+Cuando necesites extender o modificar el *config/application.rb* puedes hacerlo a través del fichero *config/application_custom.rb*. Por ejemplo si quieres modificar el idioma por defecto al inglés pondrías lo siguiente:
 
 
 ```
@@ -198,15 +198,15 @@ TODO
 
 TODO
 
-## Actualizar 
+## Actualizar
 
-Te recomendamos que agregues el remote de consul para facilitar este proceso de merge: 
+Te recomendamos que agregues el remote de consul para facilitar este proceso de merge:
 
 ```
-$ git remote add consul https://github.com/consul/consul 
+$ git remote add consul https://github.com/consul/consul
 ```
 
-Con esto puedes actualizarte con 
+Con esto puedes actualizarte con
 
 ```
 git checkout -b consul_update
diff --git a/Capfile b/Capfile
index 0f53b8e9a..1a33b63f0 100644
--- a/Capfile
+++ b/Capfile
@@ -4,13 +4,13 @@ require 'capistrano/setup'
 # Include default deployment tasks
 require 'capistrano/deploy'
 
-require 'capistrano/rvm'
-require 'capistrano/bundler'
+require "capistrano/bundler"
 require 'capistrano/rails/assets'
 require 'capistrano/rails/migrations'
 #require 'capistrano/passenger'
 require 'capistrano/delayed_job'
 require 'whenever/capistrano'
+require 'rvm1/capistrano3'
 
 # Load custom tasks from `lib/capistrano/tasks` if you have any defined
 Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }
diff --git a/Gemfile b/Gemfile
index 1819992d3..1ce218638 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,26 +3,27 @@ source 'https://rubygems.org'
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '4.2.7.1'
 # Use PostgreSQL
-gem 'pg'
+gem 'pg', '~> 0.19.0'
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 5.0', '>= 5.0.4'
 # Use Uglifier as compressor for JavaScript assets
-gem 'uglifier', '>= 1.3.0'
+gem 'uglifier', '>= 3.0.3'
 # Use CoffeeScript for .coffee assets and views
 gem 'coffee-rails', '~> 4.2.1'
 # See https://github.com/rails/execjs#readme for more supported runtimes
 # gem 'therubyracer', platforms: :ruby
 
 # Use jquery as the JavaScript library
-gem 'jquery-rails'
+gem 'jquery-rails', '~> 4.2.1'
 gem 'jquery-ui-rails'
 # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
 gem 'turbolinks'
 
 # Fix sprockets on the
-gem 'sprockets', '~> 3.6.3'
+gem 'sprockets', '~> 3.7.0'
 
 gem 'devise', '~> 3.5.7'
+gem 'devise_security_extension'
 # Use ActiveModel has_secure_password
 # gem 'bcrypt', '~> 3.1.7'
 gem 'omniauth'
@@ -31,36 +32,36 @@ gem 'omniauth-facebook', '~> 3.0.0'
 gem 'omniauth-google-oauth2', '~> 0.4.0'
 
 gem 'kaminari'
-gem 'ancestry'
+gem 'ancestry', '~> 2.2.2'
 gem 'acts-as-taggable-on'
-gem 'responders'
-gem 'foundation-rails'
-gem 'foundation_rails_helper'
+gem 'responders', '~> 2.3.0'
+gem 'foundation-rails', '~> 6.2.4.0'
+gem 'foundation_rails_helper', '~> 2.0.0'
 gem 'acts_as_votable'
 gem 'ckeditor', '~> 4.2.0'
 gem 'invisible_captcha', '~> 0.9.1'
 gem 'cancancan'
 gem 'social-share-button'
-gem 'initialjs-rails', '0.2.0.1'
+gem 'initialjs-rails', '0.2.0.4'
 gem 'unicorn', '~> 5.1.0'
-gem 'paranoia'
-gem 'rinku', require: 'rails_rinku'
+gem 'paranoia', '~> 2.2.0'
+gem 'rinku', '~> 2.0.2', require: 'rails_rinku'
 gem 'savon'
 gem 'dalli'
-gem 'rollbar', '~> 2.12.0'
+gem 'rollbar', '~> 2.13.3'
 gem 'delayed_job_active_record', '~> 4.1.0'
 gem 'daemons'
 gem 'devise-async'
-gem 'newrelic_rpm', '~> 3.16'
+gem 'newrelic_rpm', '~> 3.17.0.325'
 gem 'whenever', require: false
 gem 'pg_search'
 
-gem 'ahoy_matey', '~> 1.4.0'
-gem 'groupdate'   # group temporary data
-gem 'tolk' # Web interface for translations
+gem 'ahoy_matey', '~> 1.4.2'
+gem 'groupdate', '~> 3.1.0' # group temporary data
+gem 'tolk', '~> 2.0.0' # Web interface for translations
 
 gem 'browser'
-gem 'turnout'
+gem 'turnout', '~> 2.4.0'
 gem 'redcarpet'
 
 group :development, :test do
@@ -78,12 +79,14 @@ group :development, :test do
   gem 'letter_opener_web', '~> 1.3.0'
   gem 'i18n-tasks'
   gem 'capistrano', '3.5.0',           require: false
-  gem "capistrano-bundler", '1.1.4',   require: false
-  gem "capistrano-rails", '1.1.7',     require: false
-  gem "capistrano-rvm",                require: false
+  gem 'capistrano-bundler', '~> 1.2',  require: false
+  gem "capistrano-rails", '1.1.8',     require: false
+  gem 'rvm1-capistrano3',              require: false
   gem 'capistrano3-delayed-job', '~> 1.0'
   gem "bullet"
   gem "faker"
+  gem 'rubocop', '~> 0.45.0', require: false
+  gem 'knapsack'
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 121d7b86e..50ab5bb9d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -51,26 +51,26 @@ GEM
       safely_block (>= 0.1.1)
       user_agent_parser
       uuidtools
-    airbrussh (1.0.2)
+    airbrussh (1.1.1)
       sshkit (>= 1.6.1, != 1.7.0)
     akami (1.3.1)
       gyoku (>= 0.4.0)
       nokogiri
-    ancestry (2.1.0)
+    ancestry (2.2.2)
       activerecord (>= 3.0.0)
     arel (6.0.3)
-    ast (2.2.0)
+    ast (2.3.0)
     babel-source (5.8.35)
     babel-transpiler (0.7.0)
       babel-source (>= 4.0, < 6)
       execjs (~> 2.0)
     bcrypt (3.1.11)
-    browser (2.2.0)
+    browser (2.3.0)
     builder (3.2.2)
     bullet (5.2.0)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.10.0)
-    byebug (9.0.5)
+    byebug (9.0.6)
     cancancan (1.15.0)
     capistrano (3.5.0)
       airbrussh (>= 1.0.0)
@@ -78,16 +78,13 @@ GEM
       i18n
       rake (>= 10.0.0)
       sshkit (>= 1.9.0)
-    capistrano-bundler (1.1.4)
+    capistrano-bundler (1.2.0)
       capistrano (~> 3.1)
       sshkit (~> 1.2)
-    capistrano-harrow (0.5.2)
-    capistrano-rails (1.1.7)
+    capistrano-harrow (0.5.3)
+    capistrano-rails (1.1.8)
       capistrano (~> 3.1)
       capistrano-bundler (~> 1.1)
-    capistrano-rvm (0.1.2)
-      capistrano (~> 3.0)
-      sshkit (~> 1.2)
     capistrano3-delayed-job (1.7.2)
       capistrano (~> 3.0, >= 3.0.0)
     capybara (2.7.1)
@@ -120,7 +117,7 @@ GEM
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
       tins (>= 1.6.0, < 2)
-    daemons (1.2.3)
+    daemons (1.2.4)
     dalli (2.7.6)
     database_cleaner (1.5.3)
     debug_inspector (0.0.2)
@@ -138,6 +135,9 @@ GEM
       warden (~> 1.2.3)
     devise-async (0.10.2)
       devise (>= 3.2, < 4.0)
+    devise_security_extension (0.10.0)
+      devise (>= 3.0.0, < 4.0)
+      railties (>= 3.2.6, < 5.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
     easy_translate (0.5.0)
@@ -160,11 +160,11 @@ GEM
       i18n (~> 0.5)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    foundation-rails (6.2.3.0)
+    foundation-rails (6.2.4.0)
       railties (>= 3.1.0)
       sass (>= 3.3.0, < 3.5)
       sprockets-es6 (>= 0.9.0)
-    foundation_rails_helper (1.2.1)
+    foundation_rails_helper (2.0.0)
       actionpack (>= 4.1)
       activemodel (>= 4.1)
       activesupport (>= 4.1)
@@ -173,14 +173,14 @@ GEM
     fuubar (2.1.1)
       rspec (~> 3.0)
       ruby-progressbar (~> 1.4)
-    geocoder (1.3.7)
+    geocoder (1.4.0)
     globalid (0.3.7)
       activesupport (>= 4.1.0)
-    groupdate (3.0.1)
+    groupdate (3.1.1)
       activesupport (>= 3)
     gyoku (1.3.1)
       builder (>= 2.1.2)
-    hashie (3.4.3)
+    hashie (3.4.6)
     highline (1.7.8)
     htmlentities (4.3.4)
     httpi (2.4.1)
@@ -196,11 +196,11 @@ GEM
       parser (>= 2.2.3.0)
       term-ansicolor (>= 1.3.2)
       terminal-table (>= 1.5.1)
-    initialjs-rails (0.2.0.1)
-      railties (>= 3.1, < 5.0)
+    initialjs-rails (0.2.0.4)
+      railties (>= 3.1, < 6.0)
     invisible_captcha (0.9.1)
       rails
-    jquery-rails (4.1.1)
+    jquery-rails (4.2.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
@@ -212,6 +212,9 @@ GEM
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kgio (2.10.0)
+    knapsack (1.13.0)
+      rake
+      timecop (>= 0.1.0)
     launchy (2.4.3)
       addressable (~> 2.3)
     letter_opener (1.4.1)
@@ -228,17 +231,16 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
-    minitest (5.9.0)
+    minitest (5.9.1)
     multi_json (1.12.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (3.2.0)
-    newrelic_rpm (3.16.0.318)
-    nokogiri (1.6.8)
+    newrelic_rpm (3.17.0.325)
+    nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
     nori (2.6.0)
     oauth (0.5.0)
     oauth2 (1.0.0)
@@ -267,26 +269,26 @@ GEM
       json (~> 1.3)
       omniauth-oauth (~> 1.1)
     orm_adapter (0.5.0)
-    paranoia (2.1.5)
-      activerecord (~> 4.0)
-    parser (2.3.0.6)
+    paranoia (2.2.0)
+      activerecord (>= 4.0, < 5.1)
+    parser (2.3.1.4)
       ast (~> 2.2)
-    pg (0.18.4)
+    pg (0.19.0)
     pg_search (1.0.6)
       activerecord (>= 3.1)
       activesupport (>= 3.1)
       arel
-    pkg-config (1.1.7)
     poltergeist (1.10.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
+    powerpack (0.1.1)
     quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
-    rack (1.6.4)
+    rack (1.6.5)
     rack-accept (0.4.5)
       rack (>= 0.4)
-    rack-attack (4.4.1)
+    rack-attack (5.0.1)
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -314,21 +316,22 @@ GEM
       activesupport (= 4.2.7.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    raindrops (0.16.0)
-    rake (11.2.2)
+    rainbow (2.1.0)
+    raindrops (0.17.0)
+    rake (11.3.0)
     redcarpet (3.3.4)
     referer-parser (0.3.0)
     request_store (1.3.1)
-    responders (2.2.0)
+    responders (2.3.0)
       railties (>= 4.2.0, < 5.1)
-    rinku (2.0.0)
-    rollbar (2.12.0)
+    rinku (2.0.2)
+    rollbar (2.13.3)
       multi_json
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
       rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.1)
+    rspec-core (3.5.4)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -336,7 +339,7 @@ GEM
     rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
-    rspec-rails (3.5.1)
+    rspec-rails (3.5.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
@@ -345,7 +348,16 @@ GEM
       rspec-mocks (~> 3.5.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
+    rubocop (0.45.0)
+      parser (>= 2.3.1.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.8.1)
+    rvm1-capistrano3 (1.4.0)
+      capistrano (~> 3.0)
+      sshkit (>= 1.2)
     safe_yaml (1.0.4)
     safely_block (0.1.1)
       errbase
@@ -375,18 +387,18 @@ GEM
     spring (1.7.2)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
-    sprockets (3.6.3)
+    sprockets (3.7.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-es6 (0.9.0)
+    sprockets-es6 (0.9.2)
       babel-source (>= 5.8.11)
       babel-transpiler
       sprockets (>= 3.0.0)
-    sprockets-rails (3.1.1)
+    sprockets-rails (3.2.0)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sshkit (1.11.1)
+    sshkit (1.11.4)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
     term-ansicolor (1.3.2)
@@ -396,20 +408,23 @@ GEM
     thread (0.2.2)
     thread_safe (0.3.5)
     tilt (2.0.5)
+    timecop (0.8.1)
     tins (1.11.0)
-    tolk (1.9.3)
-      rails (>= 4.0, < 4.3)
+    tolk (2.0.0)
+      rails (>= 4.0)
       safe_yaml (>= 0.8.6)
     turbolinks (2.5.3)
       coffee-rails
-    turnout (2.3.1)
-      rack (~> 1.3)
+    turnout (2.4.0)
+      i18n (~> 0.7)
+      rack (>= 1.3, < 3)
       rack-accept (~> 0.4)
       tilt (>= 1.4, < 3)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (3.0.1)
+    uglifier (3.0.3)
       execjs (>= 0.3.0, < 3)
+    unicode-display_width (1.1.1)
     unicorn (5.1.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
@@ -439,16 +454,15 @@ PLATFORMS
 DEPENDENCIES
   acts-as-taggable-on
   acts_as_votable
-  ahoy_matey (~> 1.4.0)
-  ancestry
+  ahoy_matey (~> 1.4.2)
+  ancestry (~> 2.2.2)
   browser
   bullet
   byebug
   cancancan
   capistrano (= 3.5.0)
-  capistrano-bundler (= 1.1.4)
-  capistrano-rails (= 1.1.7)
-  capistrano-rvm
+  capistrano-bundler (~> 1.2)
+  capistrano-rails (= 1.1.8)
   capistrano3-delayed-job (~> 1.0)
   capybara
   ckeditor (~> 4.2.0)
@@ -460,50 +474,51 @@ DEPENDENCIES
   delayed_job_active_record (~> 4.1.0)
   devise (~> 3.5.7)
   devise-async
+  devise_security_extension
   email_spec
   factory_girl_rails
   faker
-  foundation-rails
-  foundation_rails_helper
+  foundation-rails (~> 6.2.4.0)
+  foundation_rails_helper (~> 2.0.0)
   fuubar
-  groupdate
+  groupdate (~> 3.1.0)
   i18n-tasks
-  initialjs-rails (= 0.2.0.1)
+  initialjs-rails (= 0.2.0.4)
   invisible_captcha (~> 0.9.1)
-  jquery-rails
+  jquery-rails (~> 4.2.1)
   jquery-ui-rails
   kaminari
+  knapsack
   launchy
   letter_opener_web (~> 1.3.0)
-  newrelic_rpm (~> 3.16)
+  newrelic_rpm (~> 3.17.0.325)
   omniauth
   omniauth-facebook (~> 3.0.0)
   omniauth-google-oauth2 (~> 0.4.0)
   omniauth-twitter
-  paranoia
-  pg
+  paranoia (~> 2.2.0)
+  pg (~> 0.19.0)
   pg_search
   poltergeist
   quiet_assets
   rails (= 4.2.7.1)
   redcarpet
-  responders
-  rinku
-  rollbar (~> 2.12.0)
+  responders (~> 2.3.0)
+  rinku (~> 2.0.2)
+  rollbar (~> 2.13.3)
   rspec-rails (~> 3.5)
+  rubocop (~> 0.45.0)
+  rvm1-capistrano3
   sass-rails (~> 5.0, >= 5.0.4)
   savon
   social-share-button
   spring
   spring-commands-rspec
-  sprockets (~> 3.6.3)
-  tolk
+  sprockets (~> 3.7.0)
+  tolk (~> 2.0.0)
   turbolinks
-  turnout
-  uglifier (>= 1.3.0)
+  turnout (~> 2.4.0)
+  uglifier (>= 3.0.3)
   unicorn (~> 5.1.0)
   web-console (= 3.3.0)
   whenever
-
-BUNDLED WITH
-   1.12.5
diff --git a/README.md b/README.md
index 27162bfd7..8c95f3648 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,9 @@ Frontend tools used include [SCSS](http://sass-lang.com/) over [Foundation](http
 
 ## Configuration for development and test environments
 
-Prerequisites: install git, Ruby 2.2.3, bundler gem, ghostscript and PostgreSQL (>=9.4).
+**NOTE**: For more detailed instructions check the [docs](https://github.com/consul/consul/tree/master/doc/en/dev_test_setup.md)
+
+Prerequisites: install git, Ruby 2.3.2, bundler gem, ghostscript and PostgreSQL (>=9.4).
 
 ```
 git clone https://github.com/consul/consul.git
@@ -32,7 +34,6 @@ cd consul
 bundle install
 cp config/database.yml.example config/database.yml
 cp config/secrets.yml.example config/secrets.yml
-rake db:create
 bin/rake db:setup
 bin/rake db:dev_seed
 RAILS_ENV=test rake db:setup
diff --git a/README_ES.md b/README_ES.md
index d8c394680..a18b7d241 100644
--- a/README_ES.md
+++ b/README_ES.md
@@ -23,7 +23,9 @@ Las herramientas utilizadas para el frontend no están cerradas aún. Los estilo
 
 ## Configuración para desarrollo y tests
 
-Prerequisitos: tener instalado git, Ruby 2.2.3, la gema `bundler`, ghostscript y PostgreSQL (9.4 o superior).
+**NOTA**: para unas instrucciones más detalladas consulta la [documentación](https://github.com/consul/consul/tree/master/doc/es/dev_test_setup.md)
+
+Prerequisitos: tener instalado git, Ruby 2.3.2, la gema `bundler`, ghostscript y PostgreSQL (9.4 o superior).
 
 ```
 
@@ -32,7 +34,6 @@ cd consul
 bundle install
 cp config/database.yml.example config/database.yml
 cp config/secrets.yml.example config/secrets.yml
-rake db:create
 bin/rake db:setup
 bin/rake db:dev_seed
 RAILS_ENV=test rake db:setup
diff --git a/Rakefile b/Rakefile
index ba6b733dd..ef2c381ff 100644
--- a/Rakefile
+++ b/Rakefile
@@ -4,3 +4,4 @@
 require File.expand_path('../config/application', __FILE__)
 
 Rails.application.load_tasks
+Knapsack.load_tasks if defined?(Knapsack)
\ No newline at end of file
diff --git a/app/assets/images/ballot.gif b/app/assets/images/ballot.gif
new file mode 100644
index 000000000..18cf0717f
Binary files /dev/null and b/app/assets/images/ballot.gif differ
diff --git a/app/assets/images/ballot_tiny.gif b/app/assets/images/ballot_tiny.gif
new file mode 100644
index 000000000..976d37591
Binary files /dev/null and b/app/assets/images/ballot_tiny.gif differ
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index b9a3ec9dc..2eb3a93a6 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -46,6 +46,7 @@
 //= require valuation_spending_proposal_form
 //= require embed_video
 //= require banners
+//= require social_share
 //= require custom
 
 var initialize_modules = function() {
@@ -68,6 +69,7 @@ var initialize_modules = function() {
   App.ValuationSpendingProposalForm.initialize();
   App.EmbedVideo.initialize();
   App.Banners.initialize();
+  App.SocialShare.initialize();
 };
 
 $(function(){
diff --git a/app/assets/javascripts/social_share.js.coffee b/app/assets/javascripts/social_share.js.coffee
new file mode 100644
index 000000000..a61f2d8f4
--- /dev/null
+++ b/app/assets/javascripts/social_share.js.coffee
@@ -0,0 +1,7 @@
+App.SocialShare =
+
+  initialize: ->
+    $(".social-share-button a").each ->
+      element = $(this)
+      site = element.data('site')
+      element.append("<span class='sr-only'>#{site}</span>")
\ No newline at end of file
diff --git a/app/assets/javascripts/votes.js.coffee b/app/assets/javascripts/votes.js.coffee
index 030b9cf46..b842c3ffc 100644
--- a/app/assets/javascripts/votes.js.coffee
+++ b/app/assets/javascripts/votes.js.coffee
@@ -3,17 +3,11 @@ App.Votes =
   hoverize: (votes) ->
     $(document).on {
       'mouseenter focus': ->
-        $("div.anonymous-votes", this).show();
-        $("div.organizations-votes", this).show();
-        $("div.not-logged", this).show();
-        $("div.no-supports-allowed", this).show();
-        $("div.logged", this).hide();
+        $("div.participation-not-allowed", this).show();
+        $("div.participation-allowed", this).hide();
       mouseleave: ->
-        $("div.anonymous-votes", this).hide();
-        $("div.organizations-votes", this).hide();
-        $("div.not-logged", this).hide();
-        $("div.no-supports-allowed", this).hide();
-        $("div.logged", this).show();
+        $("div.participation-not-allowed", this).hide();
+        $("div.participation-allowed", this).show();
     }, votes
 
   initialize: ->
diff --git a/app/assets/stylesheets/_settings.scss b/app/assets/stylesheets/_settings.scss
index 44433938b..4149020fa 100644
--- a/app/assets/stylesheets/_settings.scss
+++ b/app/assets/stylesheets/_settings.scss
@@ -48,47 +48,39 @@
 // --------------------
 
 $base-font-size:      rem-calc(17);
-$base-line-height:    rem-calc(26);
+$base-line:           rem-calc(26);
 $small-font-size:     rem-calc(14);
 $line-height:         rem-calc(24);
+$tiny-font-size:      rem-calc(12);
 
 $brand:             #004A83;
-$body:              #E9E9E9;
-$background:        #EDEFF0;
-$border:            #DEE0E3;
 $dark:              darken($brand, 10%);
 
 $text:              #222222;
 $text-medium:       #999999;
 $text-light:        #CCCCCC;
 
+$border:            #DEE0E3;
+
 $link:              #2895F1;
-$link-hover:        #2178BF;
+$link-hover:        darken($link, 20%);
 
 $debates:           #008CCF;
-$votes-bg:          #26AEEE;
-$votes-border:      #1F94CB;
 
-$votes-like:        #7BD2A8;
-$votes-like-act:    #5D9E7F;
-$votes-unlike:      #EF8585;
-$votes-unlike-act:  #BD6A6A;
+$like:              #7BD2A8;
+$unlike:            #EF8585;
 
 $delete:            #F04124;
 $check:             #46DB91;
 
 $proposals:         #FFA42D;
-$proposals-border:  #CC8425;
 
 $budget:            #454372;
 $budget-hover:      #7571BF;
 
 $highlight:         #E7F2FC;
-$featured:          #FED900;
+$featured:          #FFDC5C;
 
-$footer-bg:         #DEE0E2;
-$footer-color:      #171819;
-$footer-link:       #454A4C;
 $footer-border:     #BFC1C3;
 
 $success-bg:        #DFF0D8;
diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss
index 7eab8c070..90dee613a 100644
--- a/app/assets/stylesheets/admin.scss
+++ b/app/assets/stylesheets/admin.scss
@@ -91,7 +91,7 @@ body.admin {
 
   .admin-content {
 
-    .proposal-new, .proposal-edit {
+    .proposal-form {
       padding-top: 0;
     }
 
diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index 215f2453d..2d0de02e3 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -23,6 +23,11 @@
 // 01. Global styles
 // -----------------
 
+::selection {
+  color: white;
+  background-color: $brand;
+}
+
 body {
   font-size: $base-font-size;
 }
@@ -35,7 +40,7 @@ h1, h2, h3, h4, h5, h6 {
 p {
   font-size: $base-font-size;
   font-weight: 400;
-  line-height: $base-line-height;
+  line-height: $base-line;
 }
 
 a {
@@ -148,10 +153,6 @@ a {
   height: 100%;
 }
 
-.wrap {
-  background: white;
-}
-
 .footer, .push {
   clear: both;
   min-height: $line-height*12;
@@ -479,8 +480,16 @@ header {
     &.active {
       border-bottom: 2px solid $brand;
       color: $brand;
+
+      &:hover {
+        text-decoration: none;
+      }
     }
   }
+
+  h2 {
+    font-size: $base-font-size;
+  }
 }
 
 .search-form-header input[type=text] {
@@ -491,7 +500,7 @@ header {
 // ----------
 
 footer {
-  color: $footer-color;
+  color: $text;
 
   .logo a {
     font-family: 'Lato' !important;
@@ -511,10 +520,11 @@ footer {
   }
 
   a, a:active, a:focus {
-    color: $footer-link;
+    color: $text;
+    text-decoration: underline;
 
     &:hover {
-      color: $footer-color;
+      color: $text-medium;
     }
   }
 
@@ -523,7 +533,7 @@ footer {
   }
 
   h2 a {
-    border-bottom: 1px solid $footer-border;
+    border-bottom: 1px solid $text-light;
     display: block;
     font-size: rem-calc(24);
     line-height: rem-calc(31);
@@ -533,14 +543,14 @@ footer {
 }
 
 .footer {
-  background: $footer-bg;
+  background: $border;
   border-top: 6px solid $brand;
   margin-top: $line-height*2;
   padding-top: $line-height;
 }
 
 .subfooter {
-  border-top: 1px solid $footer-border;
+  border-top: 1px solid $text-light;
   padding-top: $line-height/2;
 }
 
@@ -567,8 +577,8 @@ footer {
   color: $link;
 
   &:hover {
-    background: $highlight;
-    color: $link-hover;
+    background: $brand;
+    color: white;
   }
 }
 
@@ -737,6 +747,56 @@ form {
 // 07. Callout
 // -----------
 
+.callout-slide {
+  animation-duration: 1s;
+  -webkit-animation-duration: 1s;
+  animation-fill-mode: both;
+  -webkit-animation-fill-mode: both;
+  animation-name: slide;
+  -webkit-animation-name: slide;
+}
+
+@-webkit-keyframes slide {
+  from {
+    -webkit-transform: translate3d(100%, 0, 0);
+    transform: translate3d(100%, 0, 0);
+    visibility: visible;
+  }
+
+  to {
+    -webkit-transform: translate3d(0, 0, 0);
+    transform: translate3d(0, 0, 0);
+  }
+}
+
+@keyframes slide {
+  from {
+    -webkit-transform: translate3d(100%, 0, 0);
+    transform: translate3d(100%, 0, 0);
+    visibility: visible;
+  }
+
+  to {
+    -webkit-transform: translate3d(0, 0, 0);
+    transform: translate3d(0, 0, 0);
+  }
+}
+
+.notice-container {
+  min-width: $line-height*12;
+  position: absolute;
+  right: 24px;
+  top: 24px;
+
+  .notice {
+    height: $line-height*4;
+
+    .notice-text {
+      width: 95%;
+    }
+  }
+}
+
 .callout {
   font-size: $small-font-size;
 
@@ -956,15 +1016,6 @@ img.avatar, img.admin-avatar, img.moderator-avatar, img.initialjs-avatar {
 // 09. Search
 // ----------
 
-.search-form h3 {
-  border-top: 1px solid $votes-border;
-  display: inline-block;
-  font-size: rem-calc(16);
-  margin: -1px 0 $line-height/2;
-  padding-top: $line-height/4;
-  text-transform: uppercase;
-}
-
 .search-results h2 {
   margin-bottom: 0;
 }
@@ -1209,13 +1260,14 @@ table {
 }
 
 .share-supported {
+  text-align: center;
 
   .social-share-button {
     display: inline-block;
   }
 
   .ssb-twitter {
-    background: none;
+    background: #45B0E3;
     color: white;
     height: $line-height;
     position: relative;
@@ -1238,7 +1290,7 @@ table {
   }
 
   .ssb-facebook {
-    background: none;
+    background: #3B5998;
     color: white;
     height: rem-calc(24);
     position: relative;
@@ -1261,7 +1313,7 @@ table {
   }
 
   .ssb-google_plus {
-    background: none;
+    background: #DE4C34;
     color: white;
     height: rem-calc(24);
     position: relative;
@@ -1512,7 +1564,7 @@ table {
 
     .comment-votes {
       color: $text-medium;
-      font-size: rem-calc(14);
+      font-size: $small-font-size;
       line-height: $line-height;
 
       a {
@@ -1522,12 +1574,21 @@ table {
 
         &:hover {
           color: $text-medium;
+          text-decoration: none;
+
+          .icon-like {
+            color: $like;
+          }
+
+          .icon-unlike {
+            color: $unlike;
+          }
         }
       }
 
       [class^="icon-"] {
-        font-size: rem-calc(20);
-        vertical-align: middle;
+        font-size: $base-font-size;
+        vertical-align: sub;
       }
     }
 
@@ -1542,6 +1603,7 @@ table {
         font-size: $small-font-size;
         margin: rem-calc(6) 0;
         padding: rem-calc(6);
+        position: relative;
 
         [class^="icon-arrow"] {
           font-size: rem-calc(18);
@@ -1646,7 +1708,8 @@ table {
 }
 
 .flag-disable, .flag-active {
-  vertical-align: middle;
+  line-height: 0;
+  vertical-align: sub;
 }
 
 .flag-disable {
diff --git a/app/assets/stylesheets/mixins.scss b/app/assets/stylesheets/mixins.scss
index d772b8ace..5ffc534cb 100644
--- a/app/assets/stylesheets/mixins.scss
+++ b/app/assets/stylesheets/mixins.scss
@@ -13,7 +13,7 @@
   font-size: rem-calc(24);
   font-weight: lighter;
 
-  @include breakpoint(small) {
+  @include breakpoint(medium) {
     line-height: $line-height*2;
     margin-top: 0;
   }
@@ -22,7 +22,7 @@
     height: 48px;
     width: 48px;
 
-    @include breakpoint(small) {
+    @include breakpoint(medium) {
       height: 80px;
       margin-right: $line-height/2;
       margin-top: 0;
diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss
index 3743d89bc..3e3e13323 100644
--- a/app/assets/stylesheets/participation.scss
+++ b/app/assets/stylesheets/participation.scss
@@ -6,21 +6,28 @@
 // 04. List participation
 // 05. Featured
 // 06. Budget
+// 07. Proposals successfull
 //
 
 // 01. Votes and supports
 // ----------------------
 
 @mixin votes {
-  background: $votes-bg;
-  border-top: 1px solid $votes-border;
-  margin: 0 rem-calc(-12);
-  padding: rem-calc(14) rem-calc(12);
+  border-top: 1px solid $border;
+  margin-top: $line-height;
+  padding: $line-height 0;
   position: relative;
 
-  .icon-like {
+  @include breakpoint(medium) {
+    border-left: 1px solid $border;
+    border-top: 0;
+    margin-top: 0;
+    padding-top: $line-height*2;
+  }
+
+  .icon-like, .icon-unlike {
     background: white;
-    border: 2px solid $votes-border;
+    border: 2px solid $text-light;
     border-radius: rem-calc(3);
     color: $text-light;
     display: inline-block;
@@ -29,191 +36,150 @@
     padding: rem-calc(3) rem-calc(6);
     position: relative;
 
-    &:hover {
-      background: $votes-like;
-      border-color: white;
+    &:hover, &:active {
       color: white;
       cursor: pointer;
       opacity: 1 !important;
     }
+  }
 
-    &:active {
-      border-color: $votes-like-act;
+  .icon-like {
+
+    &:hover, &:active {
+      background: $like;
+      border: 2px solid $like;
     }
   }
 
   .icon-unlike {
-    background: white;
-    border: 2px solid $votes-border;
-    border-radius: rem-calc(3);
-    color: $text-light;
-    display: inline-block;
-    font-size: rem-calc(30);
-    line-height: rem-calc(30);
-    padding: rem-calc(3) rem-calc(6);
-    position: relative;
 
-    &:hover {
-      background: $votes-unlike;
-      border-color: white;
-      color: white;
-      cursor: pointer;
-      opacity: 1 !important;
-    }
-
-    &:active {
-      border-color: $votes-unlike-act;
+    &:hover, &:active {
+      background: $unlike;
+      border: 2px solid $unlike;
     }
   }
 
   .like, .unlike {
     line-height: rem-calc(48);
     vertical-align: super;
+    text-decoration: none;
 
     span.percentage {
-      color: white;
+      color: $text;
       display: inline-block;
-      font-size: rem-calc(16);
+      font-size: $small-font-size;
       line-height: $line-height*2;
-      padding-left: rem-calc(8);
+      padding-right: $line-height/2;
       vertical-align: top;
+
+      @include breakpoint(medium) {
+        display: block;
+        line-height: $line-height;
+        padding-right: 0;
+      }
     }
   }
 
   .voted {
-    .icon-like {
-      background: $votes-like;
-      border-color: white;
+
+    .icon-like, .icon-unlike {
       color: white;
     }
 
+    .icon-like {
+      background: $like;
+      border: 2px solid $like;
+    }
+
     .icon-unlike {
-      background: $votes-unlike;
-      border-color: white;
-      color: white;
+      background: $unlike;
+      border: 2px solid $unlike;
     }
   }
 
   .no-voted {
+
     .icon-like, .icon-unlike {
-      opacity: .5;
+      opacity: .3;
     }
   }
 
   .total-votes {
-    color: white;
+    font-weight: bold;
     float: right;
     line-height: $line-height*2;
+
+    @include breakpoint(medium) {
+      display: block;
+      float: none;
+    }
   }
 
   .divider {
     margin: 0 rem-calc(6);
   }
-
-  .not-logged {
-    background: rgba(22,99,135,.9);
-    color: white;
-    font-size: $small-font-size;
-    height: 100%;
-    left: 0;
-    position: absolute;
-    text-align: center;
-    top: 0;
-    width: 100%;
-    filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#222222', endColorstr='#222222'); /* IE */
-
-    a {
-      color: white;
-      text-decoration: underline;
-    }
-  }
-
-  .anonymous-votes, .organizations-votes {
-    background: $warning-bg;
-    color: $color-warning;
-    height: 100%;
-    left: 0;
-    line-height: $line-height;
-    padding-top: rem-calc(12);
-    position: absolute;
-    text-align: center;
-    top: 0;
-    width: 100%;
-
-    p {
-      color: $color-warning;
-      margin: 0 rem-calc(12);
-      text-align: left;
-    }
-
-    a {
-      color: $color-warning;
-      font-weight: bold;
-      text-decoration: underline;
-    }
-  }
 }
 
 @mixin supports {
-  background: $proposals;
-  border-top: 1px solid $proposals-border;
-  margin: 0 rem-calc(-12);
-  padding: rem-calc(14) rem-calc(12);
+  padding: $line-height 0;
   position: relative;
 
   .progress {
-    background-color: rgba(255,255,255,.8);
-    height: $line-height/2;
+    background: lighten($proposals, 35%);
+    border: 1px solid lighten($proposals, 35%);
+    height: rem-calc(14);
+    position: relative;
 
     .meter {
-      background: $votes-like;
+      background: $proposals;
+      border-radius: 0;
+      border-bottom-right-radius: rem-calc(3);
+      border-top-right-radius: rem-calc(3);
       display: block;
       height: $line-height/2;
     }
   }
 
   .percentage {
-    font-size: rem-calc(10);
-    color: $brand;
-    vertical-align: top;
+    color: $text;
+    font-size: $tiny-font-size;
     position: absolute;
-    top: 13px;
-    right: 20px;
+    right: 6px;
+    top: -2px;
+    vertical-align: top;
   }
 
   abbr {
-    color: white;
+    color: $text-medium;
 
     &[title] {
-      border-bottom: 1px dotted white;
+      border-bottom: 1px dotted $text-medium;
     }
   }
 
   .button-support {
-    background: white;
+    background: $proposals;
     color: $text;
     display: inline-block;
     font-size: $small-font-size;
     margin-top: rem-calc(12);
 
-    &:hover {
-      background: $proposals-border;
-      color: white;
+    &:hover, &:active {
+      background: lighten($proposals, 25%);
       cursor: pointer;
     }
-
-    &:active {
-      opacity: .75;
-    }
   }
 
   .total-supports {
-    color: white;
+    color: $text;
+    display: block;
+    font-weight: bold;
     text-align: center;
-    font-size: $small-font-size;
 
     span {
       display: block;
+      font-size: $small-font-size;
+      font-weight: normal;
     }
   }
 
@@ -221,82 +187,77 @@
     margin: 0 rem-calc(6);
   }
 
-  .not-logged {
-    background: rgba(255,164,45,.9);
-    color: white;
-    font-size: $small-font-size;
-    height: 100%;
-    left: 0;
-    position: absolute;
-    text-align: center;
-    top: 0;
-    width: 100%;
-    filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#222222', endColorstr='#222222'); /* IE */
-
-    a {
-      color: white;
-      text-decoration: underline;
-    }
-  }
-
-  .anonymous-votes, .organizations-votes, .no-supports-allowed {
-    background: $warning-bg;
-    color: $color-warning;
-    height: 100%;
-    left: 0;
-    line-height: $line-height;
-    padding-top: rem-calc(12);
-    position: absolute;
-    text-align: center;
-    top: 0;
-    width: 100%;
-
-    p {
-      color: $color-warning;
-      margin: 0 rem-calc(12);
-      text-align: left;
-    }
-
-    a {
-      color: $color-warning;
-      font-weight: bold;
-      text-decoration: underline;
-    }
-  }
-
   .supported {
-    color: white;
+    color: $text;
     margin-top: rem-calc(12);
   }
 }
 
+.supports-container {
+  border-top: 1px solid $border;
+
+  @include breakpoint(medium) {
+    border-left: 1px solid $border;
+    border-top: 0;
+  }
+}
+
+.participation-not-allowed {
+  background: $warning-bg;
+  color: $color-warning;
+  height: 100%;
+  left: 0;
+  line-height: $line-height;
+  padding: $line-height $line-height/2;
+  position: absolute;
+  text-align: center;
+  top: 0;
+  width: 100%;
+  z-index: 2;
+
+  p {
+    color: $color-warning !important;
+    margin: 0 rem-calc(12);
+    text-align: left;
+  }
+
+  a {
+    color: $color-warning !important;
+    font-weight: bold;
+    text-decoration: underline;
+  }
+}
+
+.reply .participation-not-allowed {
+  padding-right: $line-height/2;
+  padding-top: $line-height/6;
+  text-align: right;
+}
+
 // 02. New participation
 // ---------------------
 
-.debate-new, .debate-edit,
-.proposal-new, .proposal-edit,
-.budget-proposal-new, .budget-proposal-edit,
-.spending-proposal-new, .spending-proposal-edit {
+.debate-form,
+.proposal-form,
+.budget-investment-form,
+.spending-proposal-form {
+
+  .icon-debates, .icon-proposals, .icon-budget {
+    font-size: rem-calc(50);
+    line-height: $line-height;
+    opacity: .5;
+  }
 
   .icon-debates {
     color: $debates;
-    font-size: rem-calc(60);
-    line-height: $line-height;
-    opacity: .5;
   }
 
   .icon-proposals {
     color: $proposals;
-    font-size: rem-calc(50);
-    line-height: $line-height;
-    opacity: .5;
   }
 
   .icon-budget {
     color: $budget;
-    font-size: rem-calc(50);
-    line-height: $line-height;
-    opacity: .5;
   }
 
   .recommendations {
@@ -316,14 +277,14 @@
   }
 }
 
-.debate-new, .debate-edit {
+.debate-form {
 
   .recommendations li:before {
     color: $debates;
   }
 }
 
-.proposal-new, .proposal-edit {
+.proposal-form {
 
   .recommendations li:before {
     color: $proposals;
@@ -333,7 +294,10 @@
 // 03. Show participation
 // ----------------------
 
-.debate-show, .proposal-show, .investment-project-show, .budget-investment-show {
+.debate-show,
+.proposal-show,
+.investment-project-show,
+.budget-investment-show {
 
   p {
     word-wrap: break-word;
@@ -470,57 +434,8 @@
     }
   }
 
-  .votes {
-    @include votes;
-    border: 0;
-    border-radius: 0;
-    margin: 0;
-
-    .total-votes {
-      display: block;
-      float: none;
-      line-height: $line-height;
-    }
-
-    .not-logged {
-      line-height: $line-height;
-      padding: rem-calc(24);
-    }
-
-    @include breakpoint(small + rem-calc(1) and medium down) {
-      .in-favor, .against {
-        text-align: left;
-        width: rem-calc(100);
-      }
-    }
-
-    .divider {
-      display: none;
-    }
-
-    @include breakpoint(medium) {
-      .divider {
-        display: inline-block;
-      }
-    }
-  }
-
   .supports {
     @include supports;
-    border: 0;
-    border-radius: 0;
-    margin: 0;
-
-    .total-supports {
-      display: block;
-      float: none;
-      line-height: $line-height;
-    }
-
-    .not-logged {
-      line-height: $line-height;
-      padding: rem-calc(24);
-    }
   }
 
   .leave-comment {
@@ -545,26 +460,36 @@
   word-break: break-word;
 }
 
+.proposal-show, .investment-project-show {
+
+  .supports {
+    padding: $line-height/2 0 0;
+  }
+
+  .share-supported {
+    display: none;
+  }
+}
+
 // 04. List participation
 // ----------------------
 
 .debates-list, .proposals-list, .investment-projects-list, .budget-investments-list {
 
-  @include breakpoint(small) {
+  @include breakpoint(medium) {
     margin-bottom: rem-calc(48);
   }
 }
 
 .investment-projects-list, .budget-investments-list {
 
-  @include breakpoint(small) {
+  @include breakpoint(medium) {
     min-height: $line-height*15;
   }
 }
 
 .debate, .proposal, .investment-project, .budget-investment {
-  margin-bottom: 0;
-  margin-top: 0;
+  margin: $line-height/4 0;
 
   .panel {
     background: white;
@@ -576,7 +501,7 @@
     min-height: rem-calc(192);
     padding: rem-calc(12) rem-calc(12) 0 rem-calc(12);
 
-    @include breakpoint(small) {
+    @include breakpoint(medium) {
       margin-bottom: rem-calc(-1);
       padding-bottom: rem-calc(12);
     }
@@ -701,15 +626,6 @@
     }
   }
 
-  .not-logged {
-    line-height: $line-height;
-    padding-top: rem-calc(24);
-  }
-
-  .anonymous-votes, .organizations-votes {
-    padding-top: rem-calc(24);
-  }
-
   .divider {
     display: none;
   }
@@ -731,107 +647,30 @@
   }
 }
 
-.debate {
+.debate, .debate-show {
 
   .votes {
     @include votes;
-    border: 1px solid $votes-border;
-    margin: 0 rem-calc(-12);
 
-    @include breakpoint(small) {
-      border-top-left-radius: 3px;
-      border-bottom-left-radius: 3px;
-      margin: 0 rem-calc(-25) 0 rem-calc(12);
+    .against {
+      margin-left: $line-height/4;
     }
 
-    &:after {
-      content: none;
-      position: absolute;
-      display: block;
-      border-style: solid;
-      border-color: #166387 transparent transparent transparent;
-      bottom: -14px;
-      border-left-width: 0;
-      border-right-color: transparent;
-      right: -1px;
-      border-width: 13px 13px 0 0;
-
-      @include breakpoint(small) {
-        content: "";
-      }
-    }
-
-    .total-votes {
-      display: inline-block;
-      line-height: $line-height;
-      margin-left: rem-calc(24);
-      padding-top: rem-calc(12);
-      vertical-align: top;
-
-      @include breakpoint(small) {
-        display: block;
-        float: none;
-        line-height: $line-height*2;
-        margin-left: 0;
-        padding-top: 0;
-      }
-    }
-
-    @include breakpoint(small) {
-      .like, .unlike {
-
-        span.percentage {
-          display: block;
-          line-height: $line-height/2;
-        }
-      }
+    @include breakpoint(medium) {
+      text-align: center;
     }
   }
 }
 
+.debate-show .votes {
+  border: 0;
+  padding: $line-height/2 0;
+}
+
 .proposal {
 
   .supports {
     @include supports;
-    border: 1px solid $proposals-border;
-    margin: 0 rem-calc(-12);
-
-    @include breakpoint(small) {
-      border-top-left-radius: 3px;
-      border-bottom-left-radius: 3px;
-      margin: 0 rem-calc(-25) 0 rem-calc(12);
-    }
-
-    &:after {
-      content: none;
-      position: absolute;
-      display: block;
-      border-style: solid;
-      border-color: #664212 transparent transparent transparent;
-      bottom: -14px;
-      border-left-width: 0;
-      border-right-color: transparent;
-      right: -1px;
-      border-width: 13px 13px 0 0;
-
-      @include breakpoint(small) {
-        content: "";
-      }
-    }
-
-    .total-supports {
-      display: inline-block;
-      line-height: $line-height;
-      padding-top: rem-calc(12);
-      vertical-align: top;
-
-      @include breakpoint(small) {
-        display: block;
-        float: none;
-        margin-left: 0;
-        padding-top: 0;
-      }
-    }
   }
 }
 
@@ -840,20 +679,6 @@
 
   .supports {
     @include supports;
-    background: none;
-    border: 0;
-    border-left: 1px solid $border;
-    margin: 0 rem-calc(-12);
-    min-height: rem-calc(180);
-    padding-top: 0;
-
-    @include breakpoint(small) {
-      padding-top: $line-height*1.5;
-    }
-
-    &:after {
-      content: none;
-    }
 
     .investment-project-amount,
     .budget-investment-amount {
@@ -884,36 +709,11 @@
       font-weight: bold;
     }
 
-    .supported {
-      color: $budget;
-      margin-top: 0;
-      width: 100%;
-    }
-
     .remove .icon-check-circle {
       display: block;
       font-size: rem-calc(70);
       line-height: rem-calc(70);
     }
-
-    .no-supports-allowed {
-      background: rgba(69,67,114,.96);
-      color: white;
-      padding: rem-calc(12);
-    }
-
-    .no-supports-allowed p, .no-supports-allowed a {
-      color: white;
-    }
-
-    .share-supported {
-
-      .ssb-twitter,
-      .ssb-facebook,
-      .ssb-google_plus {
-        color: $budget;
-      }
-    }
   }
 }
 
@@ -940,7 +740,8 @@
 // 05. Featured
 // ------------
 
-.featured-debates, .featured-proposals {
+.featured-debates, .featured-proposals,
+.proposals-ballot, .proposals-ballot-list {
   padding: $line-height/2 0;
 
   @include breakpoint(medium) {
@@ -997,21 +798,23 @@
     }
 
     .button-support {
+      background: $text;
+      color: $featured;
       margin-top: 0;
+
+      &:hover {
+        background: white;
+        color: $text;
+      }
     }
 
-    .not-logged,
-    .organizations-votes,
-    .anonymous-votes {
+    .participation-not-allowed {
       background: $featured;
-      color: $color-warning;
       font-size: $small-font-size;
-      line-height: $line-height;
       padding-top: 0;
 
       a {
         color: $color-warning;
-        font-weight: bold;
       }
 
       p {
@@ -1023,6 +826,7 @@
 
     .supported {
       margin-top: 0;
+      font-size: $small-font-size;
     }
 
     .share-supported {
@@ -1030,7 +834,10 @@
       .ssb-twitter,
       .ssb-facebook,
       .ssb-google_plus {
-        height: rem-calc(33);
+        background: none;
+        color: $text;
+        height: rem-calc(33) !important;
+
 
         &:before {
           font-size: rem-calc(18);
@@ -1175,6 +982,36 @@
   }
 }
 
+// 07. Proposals successfull
+// -------------------------
+
+.dark-heading {
+  background: #2D3E50;
+  color: white;
+
+  @include breakpoint(medium) {
+    padding-bottom: $line-height;
+  }
+
+  p {
+    margin-bottom: 0;
+
+    &.title {
+      color: #FFD200;
+    }
+  }
+
+  .info {
+    background: #314253;
+    padding-top: $line-height;
+
+    @include breakpoint(medium) {
+      border-top: rem-calc(6) solid #FFD200;
+    }
+  }
+}
+
+
 .big-number {
   color: $budget;
   font-size: rem-calc(60);
@@ -1302,3 +1139,83 @@ ul.ballot-list {
     }
   }
 }
+
+.featured-proposals-ballot-banner {
+  background: #2D3E50 image-url("ballot_tiny.gif") no-repeat;
+  background-position: 75% 0;
+  position: relative;
+
+  h2, a:hover h2 {
+    color: #FFD200 !important;
+  }
+
+  p {
+    color: white;
+  }
+
+  @include breakpoint(medium) {
+    margin-left: 0 !important;
+    margin-right: 0 !important;
+  }
+
+  @include breakpoint(large) {
+    background: #2D3E50 image-url("ballot.gif") no-repeat;
+    background-position: 90% 0;
+  }
+}
+
+.featured-proposals-ballot-banner,
+.successfull .panel {
+
+  .icon-successfull {
+    border-right: 60px solid #FFD200;
+    border-top: 0;
+    border-bottom: 60px solid transparent;
+    height: 0;
+    position: absolute;
+    right: 0;
+    top: 0;
+    width: 0;
+
+    &:after {
+      color: #1B254C;
+      content: "\59";
+      font-family: "icons" !important;
+      left: 34px;
+      position: absolute;
+      top: 5px;
+    }
+  }
+}
+
+.proposals-ballot-list {
+
+  .proposal-sucessfull {
+    background: white;
+    border-top: 1px solid $border;
+    padding: $line-height 0;
+    position: relative;
+  }
+}
+
+.successfull {
+
+  .panel {
+    position: relative;
+  }
+
+  .truncate {
+    display: none;
+  }
+
+  .message {
+    @include supports;
+    background: none;
+    border-top: 0;
+
+    @include breakpoint(medium) {
+      border-left: 1px solid $border;
+      margin: $line-height rem-calc(-25) 0 rem-calc(12);
+    }
+  }
+}
diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index c3d814b38..c46b6e42f 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -29,4 +29,4 @@ class AccountController < ApplicationController
       end
     end
 
-end
+end
\ No newline at end of file
diff --git a/app/controllers/admin/banners_controller.rb b/app/controllers/admin/banners_controller.rb
index dbf683b9a..c96c7c72b 100644
--- a/app/controllers/admin/banners_controller.rb
+++ b/app/controllers/admin/banners_controller.rb
@@ -38,6 +38,7 @@ class Admin::BannersController < Admin::BaseController
   end
 
   private
+
     def banner_params
       params.require(:banner).permit(:title, :description, :target_url, :style, :image, :post_started_at, :post_ended_at)
     end
@@ -53,4 +54,5 @@ class Admin::BannersController < Admin::BaseController
     def banner_imgs
       @banner_imgs = Setting.all.banner_img.map { |banner_img| [banner_img.value, banner_img.key.split('.')[1]] }
     end
+
 end
\ No newline at end of file
diff --git a/app/controllers/admin/comments_controller.rb b/app/controllers/admin/comments_controller.rb
index a0272f367..1f3d8e837 100644
--- a/app/controllers/admin/comments_controller.rb
+++ b/app/controllers/admin/comments_controller.rb
@@ -20,8 +20,9 @@ class Admin::CommentsController < Admin::BaseController
   end
 
   private
+
     def load_comment
       @comment = Comment.with_hidden.find(params[:id])
     end
 
-end
+end
\ No newline at end of file
diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rb
index f7aa5c440..5fb5e3c13 100644
--- a/app/controllers/admin/dashboard_controller.rb
+++ b/app/controllers/admin/dashboard_controller.rb
@@ -3,4 +3,4 @@ class Admin::DashboardController < Admin::BaseController
   def index
   end
 
-end
+end
\ No newline at end of file
diff --git a/app/controllers/admin/debates_controller.rb b/app/controllers/admin/debates_controller.rb
index 0b0b31b8b..bbe4a06d7 100644
--- a/app/controllers/admin/debates_controller.rb
+++ b/app/controllers/admin/debates_controller.rb
@@ -29,4 +29,4 @@ class Admin::DebatesController < Admin::BaseController
       @debate = Debate.with_hidden.find(params[:id])
     end
 
-end
+end
\ No newline at end of file
diff --git a/app/controllers/admin/officials_controller.rb b/app/controllers/admin/officials_controller.rb
index 2d570c2dc..e0a0a86ca 100644
--- a/app/controllers/admin/officials_controller.rb
+++ b/app/controllers/admin/officials_controller.rb
@@ -25,8 +25,9 @@ class Admin::OfficialsController < Admin::BaseController
   end
 
   private
+
     def user_params
       params.require(:user).permit(:official_position, :official_level)
     end
 
-end
+end
\ No newline at end of file
diff --git a/app/controllers/admin/organizations_controller.rb b/app/controllers/admin/organizations_controller.rb
index 77f71ed65..b85460459 100644
--- a/app/controllers/admin/organizations_controller.rb
+++ b/app/controllers/admin/organizations_controller.rb
@@ -27,4 +27,4 @@ class Admin::OrganizationsController < Admin::BaseController
     redirect_to request.query_parameters.merge(action: :index)
   end
 
-end
+end
\ No newline at end of file
diff --git a/app/controllers/admin/proposals_controller.rb b/app/controllers/admin/proposals_controller.rb
index e7c4934fa..2a6dfd718 100644
--- a/app/controllers/admin/proposals_controller.rb
+++ b/app/controllers/admin/proposals_controller.rb
@@ -25,4 +25,4 @@ class Admin::ProposalsController < Admin::BaseController
       @proposal = Proposal.with_hidden.find(params[:id])
     end
 
-end
+end
\ No newline at end of file
diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb
index 17bd364f3..f17afff4c 100644
--- a/app/controllers/admin/settings_controller.rb
+++ b/app/controllers/admin/settings_controller.rb
@@ -15,7 +15,9 @@ class Admin::SettingsController < Admin::BaseController
   end
 
   private
+
     def settings_params
       params.require(:setting).permit(:value)
     end
+
 end
\ No newline at end of file
diff --git a/app/controllers/admin/spending_proposals_controller.rb b/app/controllers/admin/spending_proposals_controller.rb
index e4c13e612..b5923f2f6 100644
--- a/app/controllers/admin/spending_proposals_controller.rb
+++ b/app/controllers/admin/spending_proposals_controller.rb
@@ -54,4 +54,4 @@ class Admin::SpendingProposalsController < Admin::BaseController
       @tags = ActsAsTaggableOn::Tag.spending_proposal_tags
     end
 
-end
+end
\ No newline at end of file
diff --git a/app/controllers/admin/stats_controller.rb b/app/controllers/admin/stats_controller.rb
index 7e5b902e9..3624174a5 100644
--- a/app/controllers/admin/stats_controller.rb
+++ b/app/controllers/admin/stats_controller.rb
@@ -32,4 +32,5 @@ class Admin::StatsController < Admin::BaseController
     @direct_messages = DirectMessage.count
     @users_who_have_sent_message = DirectMessage.select(:sender_id).distinct.count
   end
-end
+
+end
\ No newline at end of file
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index eed1c4fea..1e17e1c2d 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -30,4 +30,4 @@ class Admin::UsersController < Admin::BaseController
       @user = User.with_hidden.find(params[:id])
     end
 
-end
+end
\ No newline at end of file
diff --git a/app/controllers/admin/valuators_controller.rb b/app/controllers/admin/valuators_controller.rb
index 3e403c9fc..4b52a753e 100644
--- a/app/controllers/admin/valuators_controller.rb
+++ b/app/controllers/admin/valuators_controller.rb
@@ -30,8 +30,10 @@ class Admin::ValuatorsController < Admin::BaseController
   end
 
   private
+
     def create_params
       params[:valuator][:description] = nil if params[:valuator][:description].blank?
       params.require(:valuator).permit(:user_id, :description)
     end
-end
+
+end
\ No newline at end of file
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index df928aa02..0a0018c9f 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -77,4 +77,4 @@ class CommentsController < ApplicationController
       Notification.add(notifiable.author_id, notifiable) unless comment.author_id == notifiable.author_id
    end
 
-end
+end
\ No newline at end of file
diff --git a/app/controllers/concerns/commentable_actions.rb b/app/controllers/concerns/commentable_actions.rb
index 3a79238ea..ef5e60dcb 100644
--- a/app/controllers/concerns/commentable_actions.rb
+++ b/app/controllers/concerns/commentable_actions.rb
@@ -12,7 +12,7 @@ module CommentableActions
 
     @tag_cloud = tag_cloud
     @banners = Banner.with_active
-    
+
     set_resource_votes(@resources)
     set_resources_instance
   end
@@ -155,4 +155,4 @@ module CommentableActions
       nil
     end
 
-end
+end
\ No newline at end of file
diff --git a/app/controllers/concerns/moderate_actions.rb b/app/controllers/concerns/moderate_actions.rb
index 792dacde0..05aa0e97f 100644
--- a/app/controllers/concerns/moderate_actions.rb
+++ b/app/controllers/concerns/moderate_actions.rb
@@ -4,9 +4,9 @@ module ModerateActions
 
   def index
     @resources = @resources.send(@current_filter)
-                       .send("sort_by_#{@current_order}")
-                       .page(params[:page])
-                       .per(50)
+                           .send("sort_by_#{@current_order}")
+                           .page(params[:page])
+                           .per(50)
     set_resources_instance
   end
 
diff --git a/app/controllers/concerns/polymorphic.rb b/app/controllers/concerns/polymorphic.rb
index 51c5768c9..10d64698d 100644
--- a/app/controllers/concerns/polymorphic.rb
+++ b/app/controllers/concerns/polymorphic.rb
@@ -1,6 +1,7 @@
 module Polymorphic
 
   private
+
     def resource
       @resource ||= instance_variable_get("@#{resource_name}")
     end
diff --git a/app/controllers/debates_controller.rb b/app/controllers/debates_controller.rb
index e077e5e8a..8262f014a 100644
--- a/app/controllers/debates_controller.rb
+++ b/app/controllers/debates_controller.rb
@@ -21,7 +21,8 @@ class DebatesController < ApplicationController
   respond_to :html, :js
 
   def index_customization
-     @featured_debates = @debates.featured
+    @featured_debates = @debates.featured
+    @proposal_successfull_exists = Proposal.successfull.exists?
   end
 
   def show
@@ -40,7 +41,7 @@ class DebatesController < ApplicationController
   end
 
   def mark_featured
-    @debate.update_attribute(:featured_at, Time.now)
+    @debate.update_attribute(:featured_at, Time.current)
     redirect_to request.query_parameters.merge(action: :index)
   end
 
diff --git a/app/controllers/management/account_controller.rb b/app/controllers/management/account_controller.rb
index 85b9feea4..64e0ddf4d 100644
--- a/app/controllers/management/account_controller.rb
+++ b/app/controllers/management/account_controller.rb
@@ -6,6 +6,7 @@ class Management::AccountController < Management::BaseController
   end
 
   private
+
     def only_verified_users
       check_verified_user t("management.account.alert.unverified_user")
     end
diff --git a/app/controllers/management/dashboard_controller.rb b/app/controllers/management/dashboard_controller.rb
index abb605341..87b134270 100644
--- a/app/controllers/management/dashboard_controller.rb
+++ b/app/controllers/management/dashboard_controller.rb
@@ -3,4 +3,4 @@ class Management::DashboardController < Management::BaseController
   def index
   end
 
-end
+end
\ No newline at end of file
diff --git a/app/controllers/management/document_verifications_controller.rb b/app/controllers/management/document_verifications_controller.rb
index 1b8fabcc2..510e4fa93 100644
--- a/app/controllers/management/document_verifications_controller.rb
+++ b/app/controllers/management/document_verifications_controller.rb
@@ -33,17 +33,17 @@ class Management::DocumentVerificationsController < Management::BaseController
 
   private
 
-  def document_verification_params
-    params.require(:document_verification).permit(:document_type, :document_number)
-  end
+    def document_verification_params
+      params.require(:document_verification).permit(:document_type, :document_number)
+    end
 
-  def set_document
-    session[:document_type] = params[:document_verification][:document_type]
-    session[:document_number] = params[:document_verification][:document_number]
-  end
+    def set_document
+      session[:document_type] = params[:document_verification][:document_type]
+      session[:document_number] = params[:document_verification][:document_number]
+    end
 
-  def clean_document_number
-    params[:document_verification][:document_number] = params[:document_verification][:document_number].gsub(/[^a-z0-9]+/i, "").upcase unless params[:document_verification][:document_number].blank?
-  end
+    def clean_document_number
+      params[:document_verification][:document_number] = params[:document_verification][:document_number].gsub(/[^a-z0-9]+/i, "").upcase unless params[:document_verification][:document_number].blank?
+    end
 
 end
\ No newline at end of file
diff --git a/app/controllers/management/email_verifications_controller.rb b/app/controllers/management/email_verifications_controller.rb
index 3558e6fbf..7d511fe4b 100644
--- a/app/controllers/management/email_verifications_controller.rb
+++ b/app/controllers/management/email_verifications_controller.rb
@@ -16,8 +16,8 @@ class Management::EmailVerificationsController < Management::BaseController
 
   private
 
-  def email_verification_params
-    params.require(:email_verification).permit(:document_type, :document_number, :email)
-  end
+    def email_verification_params
+      params.require(:email_verification).permit(:document_type, :document_number, :email)
+    end
 
 end
\ No newline at end of file
diff --git a/app/controllers/management/proposals_controller.rb b/app/controllers/management/proposals_controller.rb
index 2ce74d6d5..1a30526f5 100644
--- a/app/controllers/management/proposals_controller.rb
+++ b/app/controllers/management/proposals_controller.rb
@@ -53,4 +53,4 @@ class Management::ProposalsController < Management::BaseController
       @comment_flags = managed_user ? managed_user.comment_flags(comments) : {}
     end
 
-end
+end
\ No newline at end of file
diff --git a/app/controllers/management/sessions_controller.rb b/app/controllers/management/sessions_controller.rb
index bca17bf4c..5d0587ae5 100644
--- a/app/controllers/management/sessions_controller.rb
+++ b/app/controllers/management/sessions_controller.rb
@@ -42,4 +42,4 @@ class Management::SessionsController < ActionController::Base
       end
     end
 
-end
+end
\ No newline at end of file
diff --git a/app/controllers/management/user_invites_controller.rb b/app/controllers/management/user_invites_controller.rb
index cbe3d1914..4d9b4909f 100644
--- a/app/controllers/management/user_invites_controller.rb
+++ b/app/controllers/management/user_invites_controller.rb
@@ -10,4 +10,4 @@ class Management::UserInvitesController < Management::BaseController
     end
   end
 
-end
+end
\ No newline at end of file
diff --git a/app/controllers/management/users_controller.rb b/app/controllers/management/users_controller.rb
index 8ee04cfdf..53004a838 100644
--- a/app/controllers/management/users_controller.rb
+++ b/app/controllers/management/users_controller.rb
@@ -8,8 +8,8 @@ class Management::UsersController < Management::BaseController
     @user = User.new(user_params)
     @user.skip_password_validation = true
     @user.terms_of_service = '1'
-    @user.residence_verified_at = Time.now
-    @user.verified_at = Time.now
+    @user.residence_verified_at = Time.current
+    @user.verified_at = Time.current
 
     if @user.save then
       render :show
diff --git a/app/controllers/moderation/users_controller.rb b/app/controllers/moderation/users_controller.rb
index 3255bb6cc..cd1fff9a5 100644
--- a/app/controllers/moderation/users_controller.rb
+++ b/app/controllers/moderation/users_controller.rb
@@ -21,13 +21,13 @@ class Moderation::UsersController < Moderation::BaseController
 
   private
 
-  def load_users
-    @users = User.with_hidden.search(params[:name_or_email]).page(params[:page]).for_render
-  end
+    def load_users
+      @users = User.with_hidden.search(params[:name_or_email]).page(params[:page]).for_render
+    end
 
-  def block_user
-    @user.block
-    Activity.log(current_user, :block, @user)
-  end
+    def block_user
+      @user.block
+      Activity.log(current_user, :block, @user)
+    end
 
 end
\ No newline at end of file
diff --git a/app/controllers/organizations/registrations_controller.rb b/app/controllers/organizations/registrations_controller.rb
index 503c26bc0..a77534d8c 100644
--- a/app/controllers/organizations/registrations_controller.rb
+++ b/app/controllers/organizations/registrations_controller.rb
@@ -24,6 +24,7 @@ class Organizations::RegistrationsController < Devise::RegistrationsController
   end
 
   protected
+
     def after_inactive_sign_up_path_for(resource)
       organizations_sign_up_success_path
     end
diff --git a/app/controllers/proposal_ballots_controller.rb b/app/controllers/proposal_ballots_controller.rb
new file mode 100644
index 000000000..4171fcda8
--- /dev/null
+++ b/app/controllers/proposal_ballots_controller.rb
@@ -0,0 +1,8 @@
+class ProposalBallotsController < ApplicationController
+  skip_authorization_check
+
+  def index
+    @proposal_ballots = Proposal.successfull.sort_by_confidence_score
+  end
+
+end
\ No newline at end of file
diff --git a/app/controllers/proposal_notifications_controller.rb b/app/controllers/proposal_notifications_controller.rb
index fc9cdf3d8..36e265e38 100644
--- a/app/controllers/proposal_notifications_controller.rb
+++ b/app/controllers/proposal_notifications_controller.rb
@@ -26,8 +26,8 @@ class ProposalNotificationsController < ApplicationController
 
   private
 
-  def proposal_notification_params
-    params.require(:proposal_notification).permit(:title, :body, :proposal_id)
-  end
+    def proposal_notification_params
+      params.require(:proposal_notification).permit(:title, :body, :proposal_id)
+    end
 
 end
\ No newline at end of file
diff --git a/app/controllers/proposals_controller.rb b/app/controllers/proposals_controller.rb
index 578395ab3..d0ff9551e 100644
--- a/app/controllers/proposals_controller.rb
+++ b/app/controllers/proposals_controller.rb
@@ -12,7 +12,7 @@ class ProposalsController < ApplicationController
 
   invisible_captcha only: [:create, :update], honeypot: :subtitle
 
-  has_orders %w{hot_score confidence_score created_at relevance}, only: :index
+  has_orders %w{hot_score confidence_score created_at relevance archival_date}, only: :index
   has_orders %w{most_voted newest oldest}, only: :show
 
   load_and_authorize_resource
@@ -26,8 +26,10 @@ class ProposalsController < ApplicationController
   end
 
   def index_customization
+    discard_archived
     load_retired
-    load_featured
+    load_proposal_ballots
+    load_featured unless @proposal_successfull_exists
   end
 
   def vote
@@ -36,7 +38,7 @@ class ProposalsController < ApplicationController
   end
 
   def retire
-    if valid_retired_params? && @proposal.update(retired_params.merge(retired_at: Time.now))
+    if valid_retired_params? && @proposal.update(retired_params.merge(retired_at: Time.current))
       redirect_to proposal_path(@proposal), notice: t('proposals.notice.retired')
     else
       render action: :retire_form
@@ -80,6 +82,10 @@ class ProposalsController < ApplicationController
       @featured_proposals_votes = current_user ? current_user.proposal_votes(proposals) : {}
     end
 
+    def discard_archived
+      @resources = @resources.not_archived unless @current_order == "archival_date"
+    end
+
     def load_retired
       if params[:retired].present?
         @resources = @resources.retired
@@ -90,11 +96,15 @@ class ProposalsController < ApplicationController
     end
 
     def load_featured
-      @featured_proposals = Proposal.all.sort_by_confidence_score.limit(3) if (!@advanced_search_terms && @search_terms.blank? && @tag_filter.blank? && params[:retired].blank?)
+      @featured_proposals = Proposal.not_archived.sort_by_confidence_score.limit(3) if (!@advanced_search_terms && @search_terms.blank? && @tag_filter.blank? && params[:retired].blank?)
       if @featured_proposals.present?
         set_featured_proposal_votes(@featured_proposals)
         @resources = @resources.where('proposals.id NOT IN (?)', @featured_proposals.map(&:id))
       end
     end
 
+    def load_proposal_ballots
+      @proposal_successfull_exists = Proposal.successfull.exists?
+    end
+
 end
diff --git a/app/controllers/stats_controller.rb b/app/controllers/stats_controller.rb
index d600e2e9c..ab6bedd6e 100644
--- a/app/controllers/stats_controller.rb
+++ b/app/controllers/stats_controller.rb
@@ -23,6 +23,6 @@ class StatsController < ApplicationController
   private
 
     def daily_cache(key, &block)
-      Rails.cache.fetch("public_stats/#{Time.now.strftime("%Y-%m-%d")}/#{key}", &block)
+      Rails.cache.fetch("public_stats/#{Time.current.strftime("%Y-%m-%d")}/#{key}", &block)
     end
 end
diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index 81eaa08cb..cbe43390b 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -44,4 +44,4 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
       @user.save || @user.save_requiring_finish_signup
     end
 
-end
+end
\ No newline at end of file
diff --git a/app/controllers/valuation/spending_proposals_controller.rb b/app/controllers/valuation/spending_proposals_controller.rb
index f130baec4..623c9ac46 100644
--- a/app/controllers/valuation/spending_proposals_controller.rb
+++ b/app/controllers/valuation/spending_proposals_controller.rb
@@ -77,4 +77,4 @@ class Valuation::SpendingProposalsController < Valuation::BaseController
       @spending_proposal.errors.empty?
     end
 
-end
+end
\ No newline at end of file
diff --git a/app/controllers/verification/email_controller.rb b/app/controllers/verification/email_controller.rb
index 9f8fd9f8a..1774197d9 100644
--- a/app/controllers/verification/email_controller.rb
+++ b/app/controllers/verification/email_controller.rb
@@ -6,7 +6,7 @@ class Verification::EmailController < ApplicationController
 
   def show
     if Verification::Email.find(current_user, params[:email_verification_token])
-      current_user.update(verified_at: Time.now)
+      current_user.update(verified_at: Time.current)
       redirect_to account_path, notice: t('verification.email.show.flash.success')
     else
       redirect_to verified_user_path, alert: t('verification.email.show.alert.failure')
diff --git a/app/controllers/verification/letter_controller.rb b/app/controllers/verification/letter_controller.rb
index bf5033b32..0e726a683 100644
--- a/app/controllers/verification/letter_controller.rb
+++ b/app/controllers/verification/letter_controller.rb
@@ -29,7 +29,7 @@ class Verification::LetterController < ApplicationController
   def update
     @letter = Verification::Letter.new(letter_params.merge(user: current_user, verify: true))
     if @letter.valid?
-      current_user.update(verified_at: Time.now)
+      current_user.update(verified_at: Time.current)
       redirect_to account_path, notice: t('verification.letter.update.flash.success')
     else
       Lock.increase_tries(@letter.user) if @letter.user
@@ -56,5 +56,4 @@ class Verification::LetterController < ApplicationController
       end
     end
 
-
 end
diff --git a/app/controllers/verification/sms_controller.rb b/app/controllers/verification/sms_controller.rb
index 1cb5b2d8e..f06af5e6a 100644
--- a/app/controllers/verification/sms_controller.rb
+++ b/app/controllers/verification/sms_controller.rb
@@ -31,7 +31,7 @@ class Verification::SmsController < ApplicationController
       ahoy.track(:level_2_user, user_id: current_user.id) rescue nil
 
       if VerifiedUser.phone?(current_user)
-        current_user.update(verified_at: Time.now)
+        current_user.update(verified_at: Time.current)
       end
 
       redirect_to_next_path
@@ -69,4 +69,4 @@ class Verification::SmsController < ApplicationController
       end
     end
 
-end
\ No newline at end of file
+end
diff --git a/app/controllers/verification/verified_user_controller.rb b/app/controllers/verification/verified_user_controller.rb
index 23045e451..e637bb232 100644
--- a/app/controllers/verification/verified_user_controller.rb
+++ b/app/controllers/verification/verified_user_controller.rb
@@ -9,6 +9,7 @@ class Verification::VerifiedUserController < ApplicationController
   end
 
   private
+
     def user_data_present?
       return false if @verified_users.blank?
 
diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
index fc43f5357..d0c650fa3 100644
--- a/app/controllers/welcome_controller.rb
+++ b/app/controllers/welcome_controller.rb
@@ -16,5 +16,4 @@ class WelcomeController < ApplicationController
     redirect_to verification_path if signed_in?
   end
 
-
 end
diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb
index 515a54deb..62d31cd05 100644
--- a/app/helpers/admin_helper.rb
+++ b/app/helpers/admin_helper.rb
@@ -5,7 +5,7 @@ module AdminHelper
   end
 
   def official_level_options
-    options = [["",0]]
+    options = [["", 0]]
     (1..5).each do |i|
       options << [[t("admin.officials.level_#{i}"), setting["official_level_#{i}_name"]].compact.join(': '), i]
     end
diff --git a/app/helpers/banners_helper.rb b/app/helpers/banners_helper.rb
index 548513c7d..a1505a39e 100644
--- a/app/helpers/banners_helper.rb
+++ b/app/helpers/banners_helper.rb
@@ -1,5 +1,7 @@
 module BannersHelper
+
   def has_banners
     @banners.count > 0
   end
+
 end
\ No newline at end of file
diff --git a/app/helpers/comments_helper.rb b/app/helpers/comments_helper.rb
index 9d9d08075..13884237b 100644
--- a/app/helpers/comments_helper.rb
+++ b/app/helpers/comments_helper.rb
@@ -39,4 +39,5 @@ module CommentsHelper
       "" # Default not author class
     end
   end
-end
+
+end
\ No newline at end of file
diff --git a/app/helpers/debates_helper.rb b/app/helpers/debates_helper.rb
index 3c1aa02a7..8db989f61 100644
--- a/app/helpers/debates_helper.rb
+++ b/app/helpers/debates_helper.rb
@@ -1,6 +1,7 @@
 module DebatesHelper
 
-  def has_featured? 
+  def has_featured?
     Debate.all.featured.count > 0
   end
+
 end
\ No newline at end of file
diff --git a/app/helpers/embed_videos_helper.rb b/app/helpers/embed_videos_helper.rb
index b48799bf5..8633549f4 100644
--- a/app/helpers/embed_videos_helper.rb
+++ b/app/helpers/embed_videos_helper.rb
@@ -9,15 +9,15 @@ module EmbedVideosHelper
     end
 
     if server == "Vimeo"
-      regExp = /vimeo.*(staffpicks\/|channels\/|videos\/|video\/|\/)([^#\&\?]*).*/
+      reg_exp = /vimeo.*(staffpicks\/|channels\/|videos\/|video\/|\/)([^#\&\?]*).*/
       src =  "https://player.vimeo.com/video/"
     elsif server == "YouTube"
-      regExp = /youtu.*(be\/|v\/|u\/\w\/|embed\/|watch\?v=|\&v=)([^#\&\?]*).*/
+      reg_exp = /youtu.*(be\/|v\/|u\/\w\/|embed\/|watch\?v=|\&v=)([^#\&\?]*).*/
       src = "https://www.youtube.com/embed/"
     end
 
-    if regExp
-      match  = link.match(regExp)
+    if reg_exp
+      match = link.match(reg_exp)
     end
 
     if match and match[2]
diff --git a/app/helpers/flags_helper.rb b/app/helpers/flags_helper.rb
index b5ba67f41..715937c0f 100644
--- a/app/helpers/flags_helper.rb
+++ b/app/helpers/flags_helper.rb
@@ -26,4 +26,4 @@ module FlagsHelper
     end
   end
 
-end
+end
\ No newline at end of file
diff --git a/app/helpers/locales_helper.rb b/app/helpers/locales_helper.rb
new file mode 100644
index 000000000..717be9e9b
--- /dev/null
+++ b/app/helpers/locales_helper.rb
@@ -0,0 +1,8 @@
+module LocalesHelper
+
+  def name_for_locale(locale)
+    default = I18n.t("locale", locale: locale)
+    I18n.backend.translate(locale, "i18n.language.name", default: default)
+  end
+
+end
\ No newline at end of file
diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
index 2b907535f..7342393a7 100644
--- a/app/helpers/notifications_helper.rb
+++ b/app/helpers/notifications_helper.rb
@@ -1,4 +1,2 @@
 module NotificationsHelper
-
-
 end
diff --git a/app/helpers/proposals_helper.rb b/app/helpers/proposals_helper.rb
index 9eaa88549..578cd1d8e 100644
--- a/app/helpers/proposals_helper.rb
+++ b/app/helpers/proposals_helper.rb
@@ -2,19 +2,19 @@ module ProposalsHelper
 
   def progress_bar_percentage(proposal)
     case proposal.cached_votes_up
-      when 0 then 0
-      when 1..Proposal.votes_needed_for_success then (proposal.total_votes.to_f * 100 / Proposal.votes_needed_for_success).floor
-      else 100
+    when 0 then 0
+    when 1..Proposal.votes_needed_for_success then (proposal.total_votes.to_f * 100 / Proposal.votes_needed_for_success).floor
+    else 100
     end
   end
 
   def supports_percentage(proposal)
     percentage = (proposal.total_votes.to_f * 100 / Proposal.votes_needed_for_success)
     case percentage
-      when 0 then "0%"
-      when 0..(0.1) then "0.1%"
-      when (0.1)..100 then number_to_percentage(percentage, strip_insignificant_zeros: true, precision: 1)
-      else "100%"
+    when 0 then "0%"
+    when 0..(0.1) then "0.1%"
+    when (0.1)..100 then number_to_percentage(percentage, strip_insignificant_zeros: true, precision: 1)
+    else "100%"
     end
   end
 
diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb
index cd90a8a39..ad844e29f 100644
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@ -8,4 +8,4 @@ module SettingsHelper
     @all_settings ||= Hash[ Setting.all.map{|s| [s.key, s.value.presence]} ]
   end
 
-end
+end
\ No newline at end of file
diff --git a/app/helpers/stats_helper.rb b/app/helpers/stats_helper.rb
index 097711b88..e481ef7e1 100644
--- a/app/helpers/stats_helper.rb
+++ b/app/helpers/stats_helper.rb
@@ -20,4 +20,5 @@ module StatsHelper
     opt[:data][:graph] = admin_api_stats_path(spending_proposals: true)
     content_tag :div, "", opt
   end
+
 end
diff --git a/app/helpers/tracks_helper.rb b/app/helpers/tracks_helper.rb
index 53c110d49..557d71802 100644
--- a/app/helpers/tracks_helper.rb
+++ b/app/helpers/tracks_helper.rb
@@ -1,4 +1,5 @@
 module TracksHelper
+
   def track_event(data={})
     track_data = ""
     prefix = " data-track-event-"
@@ -9,4 +10,5 @@ module TracksHelper
       track_data
     end
   end
+
 end
\ No newline at end of file
diff --git a/app/models/banner.rb b/app/models/banner.rb
index db8f10635..c4f2295e6 100644
--- a/app/models/banner.rb
+++ b/app/models/banner.rb
@@ -12,9 +12,9 @@ class Banner < ActiveRecord::Base
   validates :post_started_at, presence: true
   validates :post_ended_at, presence: true
 
-  scope :with_active,  -> {where("post_started_at <= ?", Time.now).
-                      where("post_ended_at >= ?", Time.now) }
+  scope :with_active,  -> {where("post_started_at <= ?", Time.current).
+                      where("post_ended_at >= ?", Time.current) }
 
-  scope :with_inactive,-> {where("post_started_at > ? or post_ended_at < ?", Time.now, Time.now) }
+  scope :with_inactive,-> {where("post_started_at > ? or post_ended_at < ?", Time.current, Time.current) }
 
-end
\ No newline at end of file
+end
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 47beb5050..0bfb6a320 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -24,8 +24,8 @@ class Comment < ActiveRecord::Base
   scope :not_as_admin_or_moderator, -> { where("administrator_id IS NULL").where("moderator_id IS NULL")}
   scope :sort_by_flags, -> { order(flags_count: :desc, updated_at: :desc) }
 
-  scope :sort_by_most_voted , -> { order(confidence_score: :desc, created_at: :desc) }
-  scope :sort_descendants_by_most_voted , -> { order(confidence_score: :desc, created_at: :asc) }
+  scope :sort_by_most_voted, -> { order(confidence_score: :desc, created_at: :desc) }
+  scope :sort_descendants_by_most_voted, -> { order(confidence_score: :desc, created_at: :asc) }
 
   scope :sort_by_newest, -> { order(created_at: :desc) }
   scope :sort_descendants_by_newest, -> { order(created_at: :desc) }
@@ -95,7 +95,7 @@ class Comment < ActiveRecord::Base
   end
 
   def self.body_max_length
-    Setting['comments_body_max_length'].to_i 
+    Setting['comments_body_max_length'].to_i
   end
 
   def calculate_confidence_score
diff --git a/app/models/concerns/flaggable.rb b/app/models/concerns/flaggable.rb
index a111562b3..c3125c440 100644
--- a/app/models/concerns/flaggable.rb
+++ b/app/models/concerns/flaggable.rb
@@ -13,7 +13,7 @@ module Flaggable
   end
 
   def ignore_flag
-    update(ignored_flag_at: Time.now)
+    update(ignored_flag_at: Time.current)
   end
 
 end
diff --git a/app/models/debate.rb b/app/models/debate.rb
index 41b270444..de29c5864 100644
--- a/app/models/debate.rb
+++ b/app/models/debate.rb
@@ -28,7 +28,7 @@ class Debate < ActiveRecord::Base
   before_save :calculate_hot_score, :calculate_confidence_score
 
   scope :for_render,               -> { includes(:tags) }
-  scope :sort_by_hot_score ,       -> { reorder(hot_score: :desc) }
+  scope :sort_by_hot_score,        -> { reorder(hot_score: :desc) }
   scope :sort_by_confidence_score, -> { reorder(confidence_score: :desc) }
   scope :sort_by_created_at,       -> { reorder(created_at: :desc) }
   scope :sort_by_most_commented,   -> { reorder(comments_count: :desc) }
diff --git a/app/models/lock.rb b/app/models/lock.rb
index 3c043de79..c0d5fae39 100644
--- a/app/models/lock.rb
+++ b/app/models/lock.rb
@@ -4,7 +4,7 @@ class Lock < ActiveRecord::Base
   before_save :set_locked_until
 
   def locked?
-    locked_until > Time.now
+    locked_until > Time.current
   end
 
   def set_locked_until
@@ -12,7 +12,7 @@ class Lock < ActiveRecord::Base
   end
 
   def lock_time
-    Time.now + (2**tries).minutes
+    Time.current + (2**tries).minutes
   end
 
   def too_many_tries?
diff --git a/app/models/notification.rb b/app/models/notification.rb
index c6c32eb8d..e993e55f8 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -49,4 +49,5 @@ class Notification < ActiveRecord::Base
   def linkable_resource
     notifiable.is_a?(ProposalNotification) ? notifiable.proposal : notifiable
   end
+
 end
\ No newline at end of file
diff --git a/app/models/organization.rb b/app/models/organization.rb
index 069afc27f..74fd16111 100644
--- a/app/models/organization.rb
+++ b/app/models/organization.rb
@@ -14,11 +14,11 @@ class Organization < ActiveRecord::Base
   scope :rejected, -> { where.not(rejected_at: nil).where("(organizations.verified_at IS NULL or organizations.verified_at < rejected_at)") }
 
   def verify
-    update(verified_at: Time.now)
+    update(verified_at: Time.current)
   end
 
   def reject
-    update(rejected_at: Time.now)
+    update(rejected_at: Time.current)
   end
 
   def verified?
diff --git a/app/models/proposal.rb b/app/models/proposal.rb
index 7ccf8995f..ebc62e364 100644
--- a/app/models/proposal.rb
+++ b/app/models/proposal.rb
@@ -44,9 +44,13 @@ class Proposal < ActiveRecord::Base
   scope :sort_by_random,           -> { reorder("RANDOM()") }
   scope :sort_by_relevance,        -> { all }
   scope :sort_by_flags,            -> { order(flags_count: :desc, updated_at: :desc) }
+  scope :sort_by_archival_date,    -> { archived.sort_by_confidence_score }
+  scope :archived,                 -> { where("proposals.created_at <= ?", Setting["months_to_archive_proposals"].to_i.months.ago)}
+  scope :not_archived,             -> { where("proposals.created_at > ?", Setting["months_to_archive_proposals"].to_i.months.ago)}
   scope :last_week,                -> { where("proposals.created_at >= ?", 7.days.ago)}
   scope :retired,                  -> { where.not(retired_at: nil) }
   scope :not_retired,              -> { where(retired_at: nil) }
+  scope :successfull,              -> { where("cached_votes_up + physical_votes >= ?", Proposal.votes_needed_for_success)}
 
   def to_param
     "#{id}-#{title}".parameterize
@@ -115,7 +119,7 @@ class Proposal < ActiveRecord::Base
   end
 
   def register_vote(user, vote_value)
-    if votable_by?(user)
+    if votable_by?(user) && !archived?
       vote_by(voter: user, vote: vote_value)
     end
   end
@@ -151,6 +155,14 @@ class Proposal < ActiveRecord::Base
     Setting['votes_for_proposal_success'].to_i
   end
 
+  def successfull?
+    total_votes >= Proposal.votes_needed_for_success
+  end
+
+  def archived?
+    self.created_at <= Setting["months_to_archive_proposals"].to_i.months.ago
+  end
+
   def notifications
     proposal_notifications
   end
diff --git a/app/models/proposal_notification.rb b/app/models/proposal_notification.rb
index f73264318..60912d887 100644
--- a/app/models/proposal_notification.rb
+++ b/app/models/proposal_notification.rb
@@ -9,9 +9,9 @@ class ProposalNotification < ActiveRecord::Base
 
   def minimum_interval
     return true if proposal.try(:notifications).blank?
-    if proposal.notifications.last.created_at > (Time.now - Setting[:proposal_notification_minimum_interval_in_days].to_i.days).to_datetime
+    if proposal.notifications.last.created_at > (Time.current - Setting[:proposal_notification_minimum_interval_in_days].to_i.days).to_datetime
       errors.add(:title, I18n.t('activerecord.errors.models.proposal_notification.attributes.minimum_interval.invalid', interval: Setting[:proposal_notification_minimum_interval_in_days]))
     end
   end
 
-end
\ No newline at end of file
+end
diff --git a/app/models/spending_proposal.rb b/app/models/spending_proposal.rb
index a2c143336..223e9adfe 100644
--- a/app/models/spending_proposal.rb
+++ b/app/models/spending_proposal.rb
@@ -114,7 +114,7 @@ class SpendingProposal < ActiveRecord::Base
 
   def send_unfeasible_email
     Mailer.unfeasible_spending_proposal(self).deliver_later
-    update(unfeasible_email_sent_at: Time.now)
+    update(unfeasible_email_sent_at: Time.current)
   end
 
   def reason_for_not_being_votable_by(user)
diff --git a/app/models/user.rb b/app/models/user.rb
index 5c69b25b1..8214b8309 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -2,8 +2,8 @@ class User < ActiveRecord::Base
 
   include Verification
 
-  devise :database_authenticatable, :registerable, :confirmable,
-         :recoverable, :rememberable, :trackable, :validatable, :omniauthable, :async
+  devise :database_authenticatable, :registerable, :confirmable, :recoverable, :rememberable,
+         :trackable, :validatable, :omniauthable, :async, :password_expirable, :secure_validatable
 
   acts_as_voter
   acts_as_paranoid column: :hidden_at
@@ -70,7 +70,7 @@ class User < ActiveRecord::Base
       oauth_email: oauth_email,
       password: Devise.friendly_token[0,20],
       terms_of_service: '1',
-      confirmed_at: oauth_email_confirmed ? DateTime.now : nil
+      confirmed_at: oauth_email_confirmed ? DateTime.current : nil
     )
   end
 
@@ -164,7 +164,7 @@ class User < ActiveRecord::Base
 
   def erase(erase_reason = nil)
     self.update(
-      erased_at: Time.now,
+      erased_at: Time.current,
       erase_reason: erase_reason,
       username: nil,
       email: nil,
@@ -252,6 +252,7 @@ class User < ActiveRecord::Base
   delegate :can?, :cannot?, to: :ability
 
   private
+
     def clean_document_number
       self.document_number = self.document_number.gsub(/[^a-z0-9]+/i, "").upcase unless self.document_number.blank?
     end
diff --git a/app/models/verification/letter.rb b/app/models/verification/letter.rb
index 0beb7c8d8..c746e73e4 100644
--- a/app/models/verification/letter.rb
+++ b/app/models/verification/letter.rb
@@ -17,7 +17,7 @@ class Verification::Letter
   end
 
   def letter_requested!
-    user.update(letter_requested_at: Time.now, letter_verification_code: generate_verification_code)
+    user.update(letter_requested_at: Time.current, letter_verification_code: generate_verification_code)
   end
 
   def validate_existing_user
diff --git a/app/models/verification/management/document.rb b/app/models/verification/management/document.rb
index fcbc19ca4..f01c132bb 100644
--- a/app/models/verification/management/document.rb
+++ b/app/models/verification/management/document.rb
@@ -40,7 +40,7 @@ class Verification::Management::Document
   end
 
   def verify
-    user.update(verified_at: Time.now) if user?
+    user.update(verified_at: Time.current) if user?
   end
 
 end
diff --git a/app/models/verification/management/email.rb b/app/models/verification/management/email.rb
index 33282b569..de13d1ab4 100644
--- a/app/models/verification/management/email.rb
+++ b/app/models/verification/management/email.rb
@@ -27,8 +27,8 @@ class Verification::Management::Email
 
     user.update(document_type: document_type,
                 document_number: document_number,
-                residence_verified_at: Time.now,
-                level_two_verified_at: Time.now,
+                residence_verified_at: Time.current,
+                level_two_verified_at: Time.current,
                 email_verification_token: plain_token)
 
     Mailer.email_verification(user, email, encrypted_token, document_type, document_number).deliver_later
diff --git a/app/models/verification/residence.rb b/app/models/verification/residence.rb
index cc24bb7c8..96a36e5cd 100644
--- a/app/models/verification/residence.rb
+++ b/app/models/verification/residence.rb
@@ -31,7 +31,7 @@ class Verification::Residence
                 geozone:               self.geozone,
                 date_of_birth:         date_of_birth.to_datetime,
                 gender:                gender,
-                residence_verified_at: Time.now)
+                residence_verified_at: Time.current)
   end
 
   def allowed_age
diff --git a/app/views/comments/_votes.html.erb b/app/views/comments/_votes.html.erb
index 8ee315e35..93af5b2dd 100644
--- a/app/views/comments/_votes.html.erb
+++ b/app/views/comments/_votes.html.erb
@@ -6,13 +6,17 @@
     <span class="in_favor">
       <% if can?(:vote, comment) %>
         <%= link_to vote_comment_path(comment, value: 'yes'),
-            method: "post", remote: true do %>
-            <span class="icon-angle-up">
+            method: "post", remote: true, title: t('votes.agree') do %>
+            <span class="icon-like">
               <span class="sr-only"><%= t('votes.agree') %></span>
             </span>
         <% end %>
       <% else %>
-        <span class="icon-angle-up"></span>
+        <%= link_to new_user_session_path do %>
+          <span class="icon-like">
+            <span class="sr-only"><%= t('votes.agree') %></span>
+          </span>
+        <% end %>
       <% end %>
       <%= comment.total_likes %>
     </span>
@@ -20,47 +24,63 @@
     <span class="against">
       <% if can?(:vote, comment) %>
         <%= link_to vote_comment_path(comment, value: 'no'),
-            method: "post", remote: true do %>
-            <span class="icon-angle-down">
+            method: "post", remote: true, title: t('votes.disagree') do %>
+            <span class="icon-unlike">
               <span class="sr-only"><%= t('votes.disagree') %></span>
             </span>
         <% end %>
       <% else %>
-        <span class="icon-angle-down"></span>
+        <span class="icon-unlike">
+          <span class="sr-only"><%= t('votes.disagree') %></span>
+        </span>
       <% end %>
       <%= comment.total_dislikes %>
     </span>
 
   <% elsif !user_signed_in? %>
 
-    <div class="logged" >
+    <div class="participation-allowed">
       <%= t('comments.comment.votes', count: comment.total_votes) %>
       &nbsp;|&nbsp;
 
       <span class="in_favor">
         <% if can?(:vote, comment) %>
           <%= link_to vote_comment_path(comment, value: 'yes'),
-              method: "post", remote: true do %>
-              <span class="icon-angle-up"></span>
+              method: "post", remote: true, title: t('votes.agree') do %>
+              <span class="icon-like">
+                <span class="sr-only"><%= t('votes.agree') %></span>
+              </span>
           <% end %>
         <% else %>
-          <span class="icon-angle-up"></span>
+          <%= link_to new_user_session_path do %>
+            <span class="icon-like">
+              <span class="sr-only"><%= t('votes.agree') %></span>
+            </span>
+          <% end %>
         <% end %>
         <%= comment.total_likes %>
       </span>
+
       <span class="against">
         <% if can?(:vote, comment) %>
           <%= link_to vote_comment_path(comment, value: 'no'),
-              method: "post", remote: true do %>
-              <span class="icon-angle-down"></span>
+              method: "post", remote: true, title: t('votes.disagree') do %>
+              <span class="icon-unlike">
+                <span class="sr-only"><%= t('votes.disagree') %></span>
+              </span>
           <% end %>
         <% else %>
-          <span class="icon-angle-down"></span>
+          <%= link_to new_user_session_path do %>
+            <span class="icon-unlike">
+              <span class="sr-only"><%= t('votes.disagree') %></span>
+            </span>
+          <% end %>
         <% end %>
         <%= comment.total_dislikes %>
       </span>
-     </div>
-    <div class="not-logged" style='display:none'>
+    </div>
+
+    <div class="participation-not-allowed" style='display:none' aria-hidden="false">
       <%= t("votes.comment_unauthenticated",
         signin: link_to(t("votes.signin"), new_user_session_path),
         signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>
diff --git a/app/views/debates/_debate.html.erb b/app/views/debates/_debate.html.erb
index 09d7d79c0..fdb975c79 100644
--- a/app/views/debates/_debate.html.erb
+++ b/app/views/debates/_debate.html.erb
@@ -48,7 +48,7 @@
           </div>
         </div>
 
-        <div id="<%= dom_id(debate) %>_votes" class="small-12 medium-3 column text-center">
+        <div id="<%= dom_id(debate) %>_votes" class="small-12 medium-3 column">
             <%= render 'debates/votes', debate: debate %>
         </div>
 
diff --git a/app/views/debates/_votes.html.erb b/app/views/debates/_votes.html.erb
index 4c5f5a9b7..cc59a3f3a 100644
--- a/app/views/debates/_votes.html.erb
+++ b/app/views/debates/_votes.html.erb
@@ -26,23 +26,23 @@
   </span>
 
   <% if user_signed_in? && current_user.organization? %>
-  <div class="organizations-votes" style='display:none' aria-hidden="false">
-    <p>
-      <%= t("votes.organizations") %>
-    </p>
-  </div>
+    <div class="participation-not-allowed" style='display:none' aria-hidden="false">
+      <p>
+        <%= t("votes.organizations") %>
+      </p>
+    </div>
   <% elsif user_signed_in? && !debate.votable_by?(current_user)%>
-  <div class="anonymous-votes" style='display:none' aria-hidden="false">
-    <p>
-      <%= t("votes.anonymous",
-          verify_account: link_to(t("votes.verify_account"), verification_path )).html_safe %>
-    </p>
-  </div>
+    <div class="participation-not-allowed" style='display:none' aria-hidden="false">
+      <p>
+        <%= t("votes.anonymous",
+            verify_account: link_to(t("votes.verify_account"), verification_path )).html_safe %>
+      </p>
+    </div>
   <% elsif !user_signed_in? %>
-  <div class="not-logged" style='display:none' aria-hidden="false">
-    <%= t("votes.unauthenticated",
-      signin: link_to(t("votes.signin"), new_user_session_path),
-      signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>
-  </div>
+    <div class="participation-not-allowed" style='display:none' aria-hidden="false">
+      <%= t("votes.unauthenticated",
+        signin: link_to(t("votes.signin"), new_user_session_path),
+        signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>
+    </div>
   <% end %>
 </div>
diff --git a/app/views/debates/edit.html.erb b/app/views/debates/edit.html.erb
index eea353438..13a2aa625 100644
--- a/app/views/debates/edit.html.erb
+++ b/app/views/debates/edit.html.erb
@@ -1,4 +1,4 @@
-<div class="debate-edit row">
+<div class="debate-form row">
 
   <div class="small-12 column">
     <%= render "shared/back_link" %>
diff --git a/app/views/debates/index.html.erb b/app/views/debates/index.html.erb
index 6809782b1..45d27bd56 100644
--- a/app/views/debates/index.html.erb
+++ b/app/views/debates/index.html.erb
@@ -6,7 +6,9 @@
 <% end %>
 
 <main>
-  <div class="wrap row">
+  <h1 class="sr-only"><%= t("shared.outline.debates") %></h1>
+
+  <div class="row">
     <div id="debates" class="debates-list small-12 medium-9 column">
 
       <div class="small-12 search-results">
@@ -29,7 +31,11 @@
         <%= render "shared/banner" %>
       <% end %>
 
-      <% unless @tag_filter || @search_terms || !has_featured? %>
+      <% if @proposal_successfull_exists %>
+        <%= render "proposals/proposal_ballots_banner" %>
+      <% end %>
+
+      <% unless @tag_filter || @search_terms || !has_featured? || @proposal_ballots.present? || @proposal_successfull_exists %>
         <%= render "featured_debates" %>
       <% end %>
 
diff --git a/app/views/debates/new.html.erb b/app/views/debates/new.html.erb
index 65d47bbcd..cd4a92cc6 100644
--- a/app/views/debates/new.html.erb
+++ b/app/views/debates/new.html.erb
@@ -1,4 +1,4 @@
-<div class="debate-new row">
+<div class="debate-form row">
 
   <div class="small-12 medium-9 column">
     <%= render "shared/back_link" %>
diff --git a/app/views/debates/show.html.erb b/app/views/debates/show.html.erb
index 9625ab42d..dca39677e 100644
--- a/app/views/debates/show.html.erb
+++ b/app/views/debates/show.html.erb
@@ -45,10 +45,8 @@
       <aside class="small-12 medium-3 column">
         <div class="sidebar-divider"></div>
         <h3><%= t("votes.supports") %></h3>
-        <div class="text-center">
-          <div id="<%= dom_id(@debate) %>_votes">
-           <%= render 'debates/votes', debate: @debate %>
-          </div>
+        <div id="<%= dom_id(@debate) %>_votes">
+          <%= render 'debates/votes', debate: @debate %>
         </div>
         <div class="sidebar-divider"></div>
         <h3><%= t("debates.show.share") %></h3>
diff --git a/app/views/devise/password_expired/show.html.erb b/app/views/devise/password_expired/show.html.erb
new file mode 100644
index 000000000..33dc82f71
--- /dev/null
+++ b/app/views/devise/password_expired/show.html.erb
@@ -0,0 +1,13 @@
+<h2><%= t("devise.password_expired.expire_password") %></h2>
+
+<%= form_for(resource, :as => resource_name, :url => [resource_name, :password_expired], :html => { :method => :put }) do |f| %>
+
+  <%= f.password_field :current_password %></p>
+
+  <%= f.label t("devise.password_expired.new_password") %> 
+  <%= f.password_field :password, label: false %></p>
+ 
+  <%= f.password_field :password_confirmation %></p>
+
+  <p><%= f.submit t("devise.password_expired.change_password") %></p>
+<% end %> 
\ No newline at end of file
diff --git a/app/views/direct_messages/show.html.erb b/app/views/direct_messages/show.html.erb
index 30a771a39..8d0f62d84 100644
--- a/app/views/direct_messages/show.html.erb
+++ b/app/views/direct_messages/show.html.erb
@@ -13,6 +13,6 @@
     </div>
 
     <h1><%= @direct_message.title %></h1>
-    <p><%= @direct_message.body %></p>
+    <p><%= simple_format text_with_links(@direct_message.body), {}, sanitize: false  %></p>
   </div>
 </div>
diff --git a/app/views/kaminari/_paginator.html.erb b/app/views/kaminari/_paginator.html.erb
index f129b1b9d..3a1495a1c 100644
--- a/app/views/kaminari/_paginator.html.erb
+++ b/app/views/kaminari/_paginator.html.erb
@@ -1,6 +1,7 @@
 <%= paginator.render do -%>
   <div class="pagination-centered">
     <nav>
+      <h1 class="sr-only"><%= t("shared.outline.pagination") %></h1>
       <ul class="pagination text-center margin-top" aria-label="Pagination">
         <%= first_page_tag unless current_page.first? %>
         <%= prev_page_tag unless current_page.first? %>
diff --git a/app/views/layouts/_flash.html.erb b/app/views/layouts/_flash.html.erb
index d07259c5c..9f55b449a 100644
--- a/app/views/layouts/_flash.html.erb
+++ b/app/views/layouts/_flash.html.erb
@@ -1,10 +1,12 @@
 <% flash.each do |flash_key, flash_message| %>
-  <div id="<%= flash_key %>" data-alert class="row" data-closable>
-    <div class="callout <%= flash_key %>">
+  <div id="<%= flash_key %>" data-alert class="notice-container callout-slide" data-closable>
+    <div class="callout notice <%= flash_key %>">
       <button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
         <span aria-hidden="true">&times;</span>
       </button>
-      <%= flash_message %>
+      <div class="notice-text">
+        <%= flash_message %>
+      </div>
     </div>
   </div>
 <% end %>
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
index da6074706..324a049af 100644
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@@ -42,7 +42,7 @@
   <div class="subfooter row">
     <div class="small-12 medium-8 column">
       <p>
-        <%= t("layouts.footer.copyright", year: Time.now.year) %>&nbsp;|&nbsp;
+        <%= t("layouts.footer.copyright", year: Time.current.year) %>&nbsp;|&nbsp;
         <%= link_to t("layouts.footer.more_info"), page_path('more_information') %>&nbsp;|&nbsp;
         <%= link_to t("layouts.footer.privacy"), page_path('privacy') %>&nbsp;|&nbsp;
         <%= link_to t("layouts.footer.conditions"), page_path('conditions') %>&nbsp;|&nbsp;
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 35f8729c8..70ae90b11 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -22,6 +22,8 @@
     <%= setting['per_page_code'].try(:html_safe) %>
   </head>
   <body>
+    <h1 class="sr-only"><%= setting['org_name'] %></h1>
+
     <div class="wrapper">
       <%= render 'layouts/header' %>
 
diff --git a/app/views/mailer/direct_message_for_receiver.html.erb b/app/views/mailer/direct_message_for_receiver.html.erb
index 2523f3502..ac86b994a 100644
--- a/app/views/mailer/direct_message_for_receiver.html.erb
+++ b/app/views/mailer/direct_message_for_receiver.html.erb
@@ -3,9 +3,9 @@
     <%= @direct_message.title %>
   </h1>
 
-  <p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;font-size: 14px;font-weight: normal;line-height: 24px;">
-    <%= @direct_message.body %>
-  </p>
+  <div style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;font-size: 14px;font-weight: normal;line-height: 24px;">
+    <%= simple_format text_with_links(@direct_message.body), {}, sanitize: false  %>
+  </div>
 
   <table style="width: 100%; border-top: 1px solid #DEE0E3; margin-top: 60px;">
     <tbody>
diff --git a/app/views/mailer/direct_message_for_sender.html.erb b/app/views/mailer/direct_message_for_sender.html.erb
index 4cf832414..127526cf4 100644
--- a/app/views/mailer/direct_message_for_sender.html.erb
+++ b/app/views/mailer/direct_message_for_sender.html.erb
@@ -9,7 +9,7 @@
     <%= @direct_message.title %>
   </h2>
 
-  <p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;font-size: 14px;font-weight: normal;line-height: 24px;">
-    <%= @direct_message.body %>
-  </p>
+  <div style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;font-size: 14px;font-weight: normal;line-height: 24px;">
+    <%= simple_format text_with_links(@direct_message.body), {}, sanitize: false  %>
+  </div>
 </td>
diff --git a/app/views/management/proposals/index.html.erb b/app/views/management/proposals/index.html.erb
index e7966f0c5..fde056902 100644
--- a/app/views/management/proposals/index.html.erb
+++ b/app/views/management/proposals/index.html.erb
@@ -1,7 +1,7 @@
 <main>
   <%= render 'admin/shared/proposal_search', url: management_proposals_path %>
 
-  <div class="wrap row">
+  <div class="row">
     <div id="proposals" class="proposals-list small-12 medium-9 column">
 
       <div class="filters">
diff --git a/app/views/management/proposals/new.html.erb b/app/views/management/proposals/new.html.erb
index e3e2087e9..07c7e734a 100644
--- a/app/views/management/proposals/new.html.erb
+++ b/app/views/management/proposals/new.html.erb
@@ -1,4 +1,4 @@
-<div class="proposal-new">
+<div class="proposal-form">
 
   <div class="clear float-right">
     <%= render '/shared/print' %>
diff --git a/app/views/management/spending_proposals/index.html.erb b/app/views/management/spending_proposals/index.html.erb
index 49e4151d2..2178caf71 100644
--- a/app/views/management/spending_proposals/index.html.erb
+++ b/app/views/management/spending_proposals/index.html.erb
@@ -3,7 +3,7 @@
     <%= render 'admin/shared/spending_proposal_search', url: management_spending_proposals_path %>
   </span>
 
-  <div class="wrap row">
+  <div class="row">
     <div id="investment-projects" class="investment-projects-list small-12 medium-9 column">
 
 
diff --git a/app/views/management/spending_proposals/new.html.erb b/app/views/management/spending_proposals/new.html.erb
index e036a04cb..b4cc82cf2 100644
--- a/app/views/management/spending_proposals/new.html.erb
+++ b/app/views/management/spending_proposals/new.html.erb
@@ -1,4 +1,4 @@
-<div class="spending-proposal-new">
+<div class="spending-proposal-form">
 
   <div class="clear float-right">
     <%= render '/shared/print' %>
diff --git a/app/views/proposal_ballots/_successfull_proposal.html.erb b/app/views/proposal_ballots/_successfull_proposal.html.erb
new file mode 100644
index 000000000..870e61605
--- /dev/null
+++ b/app/views/proposal_ballots/_successfull_proposal.html.erb
@@ -0,0 +1,13 @@
+<div id="<%= dom_id(proposal) %>" class="proposal-sucessfull">
+  <h3><%= link_to proposal.title, proposal %></h3>
+  <div class="info">
+    <% if proposal.author.hidden? || proposal.author.erased? %>
+      <%= t("proposals.show.author_deleted") %>
+    <% else %>
+      <%= proposal.author.name %>
+    <% end %>
+
+    <span class="bullet">&nbsp;&bull;&nbsp;</span>
+    <%= l proposal.created_at.to_date %>
+  </div>
+</div>
diff --git a/app/views/proposal_ballots/index.html.erb b/app/views/proposal_ballots/index.html.erb
new file mode 100644
index 000000000..00a07fb9e
--- /dev/null
+++ b/app/views/proposal_ballots/index.html.erb
@@ -0,0 +1,35 @@
+<div class="expanded no-margin-top margin-bottom dark-heading">
+  <div class="row" data-equalizer>
+    <div class="small-12 medium-6 column padding" data-equalizer-watch>
+      <h2>
+        <%= t("proposal_ballots.title") %>
+      </h2>
+      <p>
+        <%= t("proposal_ballots.description_html").html_safe %>
+      </p>
+    </div>
+
+    <div class="small-12 medium-4 column info" data-equalizer-watch>
+      <p class="title"><strong><%= t("proposal_ballots.date_title") %></strong></p>
+      <h3><%= t("proposal_ballots.date") %></h3>
+    </div>
+  </div>
+</div>
+
+<main>
+  <div class="row">
+    <div class="small-12 column">
+      <% if @proposal_ballots.present? %>
+        <div class="proposals-ballot-list">
+          <% @proposal_ballots.each do |proposal_for_vote| %>
+            <%= render "successfull_proposal", proposal: proposal_for_vote %>
+          <% end %>
+        </div>
+      <% else %>
+        <p>
+          <%= t("proposal_ballots.nothing_to_vote") %>
+        </p>
+      <% end %>
+    </div>
+  </div>
+</main>
diff --git a/app/views/proposals/_featured_votes.html.erb b/app/views/proposals/_featured_votes.html.erb
index bfc979450..3177812a4 100644
--- a/app/views/proposals/_featured_votes.html.erb
+++ b/app/views/proposals/_featured_votes.html.erb
@@ -1,4 +1,4 @@
-<div class="supports">
+<div class="supports text-center">
   <div class="in-favor">
     <% if voted_for?(@featured_proposals_votes, proposal) %>
       <div class="supported">
@@ -14,24 +14,24 @@
   </div>
 
   <% if user_signed_in? && current_user.organization? %>
-  <div class="organizations-votes" style='display:none'>
-    <p>
-      <%= t("votes.organizations") %>
-    </p>
-  </div>
+    <div class="participation-not-allowed" style='display:none' aria-hidden="false">
+      <p>
+        <%= t("votes.organizations") %>
+      </p>
+    </div>
   <% elsif user_signed_in? && !proposal.votable_by?(current_user)%>
-  <div class="anonymous-votes" style='display:none'>
-    <p>
-      <%= t("votes.verified_only",
-          verify_account: link_to(t("votes.verify_account"), verification_path )).html_safe %>
-    </p>
-  </div>
+    <div class="participation-not-allowed" style='display:none' aria-hidden="false">
+      <p>
+        <%= t("votes.verified_only",
+            verify_account: link_to(t("votes.verify_account"), verification_path )).html_safe %>
+      </p>
+    </div>
   <% elsif !user_signed_in? %>
-  <div class="not-logged" style='display:none'>
-    <%= t("votes.unauthenticated",
-      signin: link_to(t("votes.signin"), new_user_session_path),
-      signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>
-  </div>
+    <div class="participation-not-allowed" style='display:none' aria-hidden="false">
+      <%= t("votes.unauthenticated",
+        signin: link_to(t("votes.signin"), new_user_session_path),
+        signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>
+    </div>
   <% end %>
 
   <% if voted_for?(@featured_proposals_votes, proposal) %>
diff --git a/app/views/proposals/_proposal.html.erb b/app/views/proposals/_proposal.html.erb
index 70c2b9c89..dc37934d5 100644
--- a/app/views/proposals/_proposal.html.erb
+++ b/app/views/proposals/_proposal.html.erb
@@ -1,10 +1,12 @@
-<div id="<%= dom_id(proposal) %>" class="proposal clear" data-type="proposal">
+<div id="<%= dom_id(proposal) %>"
+     class="proposal clear <%= ("successfull" if proposal.total_votes > Proposal.votes_needed_for_success) %>"
+     data-type="proposal">
   <div class="panel">
+    <div class="icon-successfull"></div>
     <div class="row">
 
       <div class="small-12 medium-9 column">
         <div class="proposal-content">
-
           <% cache [locale_and_user_status(proposal), 'index', proposal, proposal.author] do %>
             <span class="label-proposal float-left"><%= t("proposals.proposal.proposal") %></span>
             <span class="icon-proposals"></span>
@@ -50,11 +52,22 @@
         </div>
       </div>
 
-      <div id="<%= dom_id(proposal) %>_votes" class="small-12 medium-3 column text-center">
-          <%= render 'votes',
-                    { proposal: proposal, vote_url: vote_proposal_path(proposal, value: 'yes') } %>
+      <div id="<%= dom_id(proposal) %>_votes" class="small-12 medium-3 column supports-container">
+        <div class="supports text-center">
+          <% if proposal.successfull? %>
+            <p>
+              <%= t("proposal_ballots.successfull",
+                  voting: link_to(t("proposal_ballots.voting"), proposal_ballots_path)).html_safe %>
+            </p>
+          <% elsif proposal.archived? %>
+            <strong><%= t("proposals.proposal.supports", count: proposal.total_votes) %></strong>
+            <p><%= t("proposals.proposal.archived") %></p>
+          <% else %>
+            <%= render 'votes',
+                      { proposal: proposal, vote_url: vote_proposal_path(proposal, value: 'yes') } %>
+          <% end %>
+        </div>
       </div>
-
     </div>
   </div>
 </div>
diff --git a/app/views/proposals/_proposal_ballots_banner.html.erb b/app/views/proposals/_proposal_ballots_banner.html.erb
new file mode 100644
index 000000000..df210a535
--- /dev/null
+++ b/app/views/proposals/_proposal_ballots_banner.html.erb
@@ -0,0 +1,9 @@
+<div id="next-voting" class="row featured-proposals-ballot-banner">
+  <%= link_to proposal_ballots_path do %>
+    <div class="small-12 column padding">
+      <div class="icon-successfull"></div>
+      <h2><%= t("proposal_ballots.featured_title") %></h2>
+      <p><%= t("proposal_ballots.info") %></p>
+    </div>
+  <% end %>
+</div>
diff --git a/app/views/proposals/_votes.html.erb b/app/views/proposals/_votes.html.erb
index 0c572e71f..4c2a348ca 100644
--- a/app/views/proposals/_votes.html.erb
+++ b/app/views/proposals/_votes.html.erb
@@ -1,59 +1,56 @@
-<div class="supports">
-
-  <div class="progress small-12 round">
-    <span class="meter" style="width: <%= progress_bar_percentage(proposal) %>%;"></span>
-    <span class="percentage">
-      <%= supports_percentage(proposal) %>&nbsp;/&nbsp;<%= t("proposals.proposal.total_percent") %>
-    </span>
-  </div>
-
-  <span class="total-supports">
-    <%= t("proposals.proposal.supports", count: proposal.total_votes) %>&nbsp;
-    <span>
-      <abbr title="<%= t("proposals.proposal.reason_for_supports_necessary") %>">
-        <%= t("proposals.proposal.supports_necessary", number: number_with_delimiter(Proposal.votes_needed_for_success)) %>
-      </abbr>
-    </span>
+<div class="progress small-12 round">
+  <span class="meter" style="width: <%= progress_bar_percentage(proposal) %>%;"></span>
+  <span class="percentage">
+    <%= supports_percentage(proposal) %>&nbsp;/&nbsp;<%= t("proposals.proposal.total_percent") %>
   </span>
+</div>
 
-  <div class="in-favor">
-    <% if voted_for?(@proposal_votes, proposal) %>
-      <div class="supported">
-        <%= t("proposals.proposal.already_supported") %>
-      </div>
-    <% else %>
-      <%= link_to vote_url,
-          class: "button button-support small expanded",
-          title: t('proposals.proposal.support_title'), method: "post", remote: true do %>
-        <%= t("proposals.proposal.support") %>
-      <% end %>
+<span class="total-supports">
+  <%= t("proposals.proposal.supports", count: proposal.total_votes) %>&nbsp;
+  <span>
+    <abbr title="<%= t("proposals.proposal.reason_for_supports_necessary") %>">
+      <%= t("proposals.proposal.supports_necessary", number: number_with_delimiter(Proposal.votes_needed_for_success)) %>
+    </abbr>
+  </span>
+</span>
+
+<div class="in-favor">
+  <% if voted_for?(@proposal_votes, proposal) %>
+    <div class="supported callout success">
+      <%= t("proposals.proposal.already_supported") %>
+    </div>
+  <% else %>
+    <%= link_to vote_url,
+        class: "button button-support small expanded",
+        title: t('proposals.proposal.support_title'), method: "post", remote: true do %>
+      <%= t("proposals.proposal.support") %>
     <% end %>
-  </div>
+  <% end %>
+</div>
 
-  <% if user_signed_in? && current_user.organization? %>
-  <div class="organizations-votes" style='display:none' aria-hidden="false">
+<% if user_signed_in? && current_user.organization? %>
+  <div class="participation-not-allowed" style='display:none' aria-hidden="false">
     <p>
       <%= t("votes.organizations") %>
     </p>
   </div>
-  <% elsif user_signed_in? && !proposal.votable_by?(current_user)%>
-  <div class="anonymous-votes" style='display:none' aria-hidden="false">
+<% elsif user_signed_in? && !proposal.votable_by?(current_user)%>
+  <div class="participation-not-allowed" style='display:none' aria-hidden="false">
     <p>
       <%= t("votes.verified_only",
           verify_account: link_to(t("votes.verify_account"), verification_path )).html_safe %>
     </p>
   </div>
-  <% elsif !user_signed_in? %>
-  <div class="not-logged" style='display:none' aria-hidden="false">
+<% elsif !user_signed_in? %>
+  <div class="participation-not-allowed" style='display:none' aria-hidden="false">
     <%= t("votes.unauthenticated",
       signin: link_to(t("votes.signin"), new_user_session_path),
       signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>
   </div>
-  <% end %>
+<% end %>
 
-  <% if voted_for?(@proposal_votes, proposal) && setting['twitter_handle'] %>
-    <div class="share-supported">
-      <%= social_share_button_tag("#{proposal.title} #{setting['twitter_hashtag']}", url: proposal_url(proposal), via: setting['twitter_handle']) %>
-    </div>
-  <% end %>
-</div>
+<% if voted_for?(@proposal_votes, proposal) && setting['twitter_handle'] %>
+  <div class="share-supported">
+    <%= social_share_button_tag("#{proposal.title} #{setting['twitter_hashtag']}", url: proposal_url(proposal), via: setting['twitter_handle']) %>
+  </div>
+<% end %>
diff --git a/app/views/proposals/index.html.erb b/app/views/proposals/index.html.erb
index 6f6516890..fd781c04b 100644
--- a/app/views/proposals/index.html.erb
+++ b/app/views/proposals/index.html.erb
@@ -6,7 +6,9 @@
 <% end %>
 
 <main>
-  <div class="wrap row">
+  <h1 class="sr-only"><%= t("shared.outline.proposals") %></h1>
+
+  <div class="row">
     <div id="proposals" class="proposals-list small-12 medium-9 column">
 
       <div class="small-12 search-results">
@@ -30,8 +32,10 @@
       <% if has_banners %>
         <%= render "shared/banner" %>
       <% end %>
-      
-      <% if @featured_proposals.present? %>
+
+      <% if @proposal_successfull_exists %>
+        <%= render "proposal_ballots_banner" %>
+      <% elsif @featured_proposals.present? %>
         <div id="featured-proposals" class="row featured-proposals">
           <div class="small-12 column">
             <h2>
@@ -52,8 +56,10 @@
         <%= link_to t("proposals.index.start_proposal"), new_proposal_path, class: 'button expanded' %>
       </div>
 
-      <%= render partial: 'proposals/proposal', collection: @proposals %>
-      <%= paginate @proposals %>
+      <div id="proposals-list">
+        <%= render partial: 'proposals/proposal', collection: @proposals %>
+        <%= paginate @proposals %>
+      </div>
     </div>
 
     <div class="small-12 medium-3 column">
diff --git a/app/views/proposals/new.html.erb b/app/views/proposals/new.html.erb
index 2887cd97a..fb9bcaf38 100644
--- a/app/views/proposals/new.html.erb
+++ b/app/views/proposals/new.html.erb
@@ -1,4 +1,4 @@
-<div class="proposal-new row">
+<div class="proposal-form row">
 
   <div class="small-12 medium-9 column">
     <%= render "shared/back_link" %>
diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb
index 3a9869d83..c010ed9db 100644
--- a/app/views/proposals/show.html.erb
+++ b/app/views/proposals/show.html.erb
@@ -102,11 +102,21 @@
       <aside class="small-12 medium-3 column">
         <div class="sidebar-divider"></div>
         <h3><%= t("votes.supports") %></h3>
-        <div class="text-center">
-          <div id="<%= dom_id(@proposal) %>_votes">
-           <%= render 'votes',
+        <div id="<%= dom_id(@proposal) %>_votes" class="supports text-center">
+          <% if @proposal.successfull? %>
+            <p>
+              <%= t("proposal_ballots.successfull",
+                  voting: link_to(t("proposal_ballots.voting"), proposal_ballots_path)).html_safe %>
+            </p>
+          <% elsif @proposal.archived? %>
+            <p>
+              <strong><%= t("proposals.proposal.supports", count: @proposal.total_votes) %></strong>
+            </p>
+            <p><%= t("proposals.proposal.archived") %></p>
+          <% else %>
+            <%= render 'votes',
                       { proposal: @proposal, vote_url: vote_proposal_path(@proposal, value: 'yes') } %>
-          </div>
+          <% end %>
         </div>
         <div id="social-share" class="sidebar-divider"></div>
         <h3><%= t("proposals.show.share") %></h3>
diff --git a/app/views/proposals/summary.html.erb b/app/views/proposals/summary.html.erb
index 38c56c963..d5bc22196 100644
--- a/app/views/proposals/summary.html.erb
+++ b/app/views/proposals/summary.html.erb
@@ -1,5 +1,5 @@
 <main>
-  <div class="wrap row proposals-summary">
+  <div class="row proposals-summary">
     <div id="proposals" class="proposals-list small-12 medium-9 column">
       <%= render "shared/back_link" %>
 
diff --git a/app/views/shared/_locale_switcher.html.erb b/app/views/shared/_locale_switcher.html.erb
index f29defcbd..af184fe48 100644
--- a/app/views/shared/_locale_switcher.html.erb
+++ b/app/views/shared/_locale_switcher.html.erb
@@ -8,7 +8,7 @@
         <% I18n.available_locales.map do |loc| %>
           <option <%= "selected" if loc == I18n.locale %>
                   value="<%= current_path_with_query_params(locale: loc) %>">
-            <%= I18n.t("locale", locale: loc) %>
+            <%= name_for_locale(loc) %>
           </option>
         <% end %>
       </select>
diff --git a/app/views/shared/_order_links.html.erb b/app/views/shared/_order_links.html.erb
index 1e8554916..1032939d9 100644
--- a/app/views/shared/_order_links.html.erb
+++ b/app/views/shared/_order_links.html.erb
@@ -1,7 +1,9 @@
-<section class="submenu">
+<div class="submenu">
   <% valid_orders.each do |order| %>
-    <%= link_to t("#{i18n_namespace}.orders.#{order}"),
-                current_path_with_query_params(order: order, page: 1),
-                class: order == @current_order ? 'active' : '' %>
+    <%= link_to current_path_with_query_params(order: order, page: 1), class: order == @current_order ? 'active' : '' do %>
+      <%= content_tag(order == @current_order ? :h2 : :span) do %>
+        <%= t("#{i18n_namespace}.orders.#{order}") %>
+      <% end %>
+    <% end %>
   <% end %>
-</section>
+</div>
diff --git a/app/views/shared/_search_form.html.erb b/app/views/shared/_search_form.html.erb
index 84e7735a1..5577f29d2 100644
--- a/app/views/shared/_search_form.html.erb
+++ b/app/views/shared/_search_form.html.erb
@@ -1,4 +1,5 @@
 <div id="search_form" class="search-form-header">
+  <h1 class="sr-only"><%= t("shared.outline.searcher") %></h1>
   <%= form_tag search_path, method: :get do %>
     <div class="input-group">
       <label class="sr-only"><%= t("#{i18n_namespace}.title") %></label>
diff --git a/app/views/shared/_subnavigation.html.erb b/app/views/shared/_subnavigation.html.erb
index 0fb7fe37c..8c654743f 100644
--- a/app/views/shared/_subnavigation.html.erb
+++ b/app/views/shared/_subnavigation.html.erb
@@ -8,6 +8,9 @@
     <li>
       <%= link_to t("layouts.header.proposals"), proposals_path, class: ("active" if  controller_name == "proposals"), accesskey: "p" %>
     </li>
+    <li>
+      <%= link_to t("layouts.header.proposal_ballot"), proposal_ballots_path, class: ("active" if  controller_name == "proposal_ballots"), accesskey: "v" %>
+    </li>
     <% if feature?(:spending_proposals) %>
       <li>
         <%= link_to t("layouts.header.budgets"), budgets_path, class: ("active" if controller_name == "budgets"), accesskey: "s" %>
diff --git a/app/views/shared/_top_links.html.erb b/app/views/shared/_top_links.html.erb
index be6afb0d7..6d8881cf6 100644
--- a/app/views/shared/_top_links.html.erb
+++ b/app/views/shared/_top_links.html.erb
@@ -1,8 +1,7 @@
-<section class="top-links hide-for-small-only">
+<div class="top-links hide-for-small-only">
   <div class="row">
     <%= render "shared/locale_switcher" %>
     <div class="external-links">
-      <%= link_to setting['org_name'], root_path, class: ("selected" unless current_page?("/opendata")) %>&nbsp;|
       <%= link_to t("layouts.header.external_link_transparency"), t("layouts.header.external_link_transparency_url") %>&nbsp;|
       <%= link_to t("layouts.header.external_link_opendata"), "/opendata", class: ("selected" if current_page?("/opendata")) %>
       <% if setting['blog_url'] %>
@@ -13,4 +12,4 @@
       <% end %>
     </div>
   </div>
-</section>
+</div>
diff --git a/app/views/spending_proposals/_spending_proposal.html.erb b/app/views/spending_proposals/_spending_proposal.html.erb
index 2854353bb..62e027913 100644
--- a/app/views/spending_proposals/_spending_proposal.html.erb
+++ b/app/views/spending_proposals/_spending_proposal.html.erb
@@ -49,7 +49,7 @@
         </div>
       </div>
 
-      <div id="<%= dom_id(spending_proposal) %>_votes" class="small-12 medium-3 column text-center">
+      <div id="<%= dom_id(spending_proposal) %>_votes" class="small-12 medium-3 column supports-container">
           <%= render 'votes',
                     { spending_proposal: spending_proposal, vote_url: vote_spending_proposal_path(spending_proposal, value: 'yes') } %>
       </div>
diff --git a/app/views/spending_proposals/_votes.html.erb b/app/views/spending_proposals/_votes.html.erb
index a4fd43993..e14d19bcb 100644
--- a/app/views/spending_proposals/_votes.html.erb
+++ b/app/views/spending_proposals/_votes.html.erb
@@ -1,4 +1,4 @@
-<div class="supports">
+<div class="supports text-center">
 
   <% reason = spending_proposal.reason_for_not_being_votable_by(current_user) %>
   <% voting_allowed = true unless reason.presence == :not_voting_allowed %>
@@ -10,7 +10,7 @@
 
   <div class="in-favor">
     <% if user_voted_for %>
-      <div class="supported">
+      <div class="supported callout success">
         <%= t("spending_proposals.spending_proposal.already_supported") %>
       </div>
     <% elsif voting_allowed %>
@@ -24,7 +24,7 @@
   </div>
 
   <% if reason.present? && !user_voted_for %>
-    <div class="no-supports-allowed" style='display:none' aria-hidden="false">
+    <div class="participation-not-allowed" style='display:none' aria-hidden="false">
       <p>
           <%= t("votes.spending_proposals.#{reason}",
                 verify_account: link_to(t("votes.verify_account"), verification_path),
diff --git a/app/views/spending_proposals/index.html.erb b/app/views/spending_proposals/index.html.erb
index 563b84e23..3b83fb797 100644
--- a/app/views/spending_proposals/index.html.erb
+++ b/app/views/spending_proposals/index.html.erb
@@ -6,7 +6,9 @@
 <% end %>
 
 <main>
-  <div class="wrap row">
+  <h1 class="sr-only"><%= t("shared.outline.budget") %></h1>
+
+  <div class="row">
     <div id="investment-projects" class="investment-projects-list small-12 medium-9 column">
 
       <div class="small-12 search-results">
diff --git a/app/views/spending_proposals/new.html.erb b/app/views/spending_proposals/new.html.erb
index 219444857..6c962c482 100644
--- a/app/views/spending_proposals/new.html.erb
+++ b/app/views/spending_proposals/new.html.erb
@@ -1,4 +1,4 @@
-<div class="spending-proposal-new row margin-top">
+<div class="spending-proposal-form row margin-top">
 
   <div class="small-12 medium-9 column">
     <%= render "shared/back_link" %>
diff --git a/bin/rails b/bin/rails
index 4d608edeb..5191e6927 100755
--- a/bin/rails
+++ b/bin/rails
@@ -1,8 +1,4 @@
 #!/usr/bin/env ruby
-begin
-  load File.expand_path("../spring", __FILE__)
-rescue LoadError
-end
 APP_PATH = File.expand_path('../../config/application', __FILE__)
 require_relative '../config/boot'
 require 'rails/commands'
diff --git a/bin/rake b/bin/rake
index 8017a0271..17240489f 100755
--- a/bin/rake
+++ b/bin/rake
@@ -1,8 +1,4 @@
 #!/usr/bin/env ruby
-begin
-  load File.expand_path("../spring", __FILE__)
-rescue LoadError
-end
 require_relative '../config/boot'
 require 'rake'
 Rake.application.run
diff --git a/bin/rspec b/bin/rspec
index 5a3c87c5f..d738b23c0 100755
--- a/bin/rspec
+++ b/bin/rspec
@@ -1,9 +1,5 @@
 #!/usr/bin/env ruby
-begin
-  load File.expand_path('../spring', __FILE__)
-rescue LoadError => e
-  raise unless e.message.include?('spring')
-end
+# frozen_string_literal: true
 #
 # This file was generated by Bundler.
 #
@@ -11,11 +7,11 @@ end
 # this file is here to facilitate running it.
 #
 
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
   Pathname.new(__FILE__).realpath)
 
-require 'rubygems'
-require 'bundler/setup'
+require "rubygems"
+require "bundler/setup"
 
-load Gem.bin_path('rspec-core', 'rspec')
+load Gem.bin_path("rspec-core", "rspec")
diff --git a/bin/spring b/bin/spring
index 62ec28f8c..43731fe82 100755
--- a/bin/spring
+++ b/bin/spring
@@ -1,15 +1,17 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'spring' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
 
-# This file loads spring without using Bundler, in order to be fast.
-# It gets overwritten when you run the `spring binstub` command.
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
 
-unless defined?(Spring)
-  require 'rubygems'
-  require 'bundler'
+require "rubygems"
+require "bundler/setup"
 
-  if (match = Bundler.default_lockfile.read.match(/^GEM$.*?^    (?:  )*spring \((.*?)\)$.*?^$/m))
-    Gem.paths = { 'GEM_PATH' => [Bundler.bundle_path.to_s, *Gem.path].uniq }
-    gem 'spring', match[1]
-    require 'spring/binstub'
-  end
-end
+load Gem.bin_path("spring", "spring")
diff --git a/config/application.rb b/config/application.rb
index 3f2a0861a..ea799001e 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -20,11 +20,8 @@ module Consul
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     config.i18n.default_locale = :es
-
-    config.i18n.available_locales = [:en, :es]
-
-    # Add the new directories to the locales load path
-    config.i18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.{rb,yml}')]
+    config.i18n.available_locales = [:en, :es, :fr, 'pt-BR']
+    config.i18n.fallbacks = {'fr' => 'es', 'pt-br' => 'es'}
 
     config.assets.paths << Rails.root.join("app", "assets", "fonts")
 
@@ -44,7 +41,7 @@ module Consul
     config.autoload_paths << "#{Rails.root}/app/controllers/custom"
     config.autoload_paths << "#{Rails.root}/app/models/custom"
     config.paths['app/views'].unshift(Rails.root.join('app', 'views', 'custom'))
-
+    config.i18n.load_path += Dir[Rails.root.join('config', 'locales', 'custom', '*.{rb,yml}')]
   end
 end
 
diff --git a/config/deploy.rb b/config/deploy.rb
index 884d50641..acce83b3c 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -7,15 +7,12 @@ def deploysecret(key)
 end
 
 set :rails_env, fetch(:stage)
-set :rvm_ruby_version, '2.3.1'
-set :rvm_type, :user
+set :rvm1_ruby_version, '2.3.2'
 
 set :application, 'consul'
 set :full_app_name, deploysecret(:full_app_name)
 
 set :server_name, deploysecret(:server_name)
-#set :repo_url, 'git@github.com:consul/consul.git'
-# If ssh access is restricted, probably you need to use https access
 set :repo_url, 'https://github.com/consul/consul.git'
 
 set :scm, :git
@@ -32,34 +29,30 @@ set :keep_releases, 5
 
 set :local_user, ENV['USER']
 
-# Run test before deploy
-set :tests, ["spec"]
-
 set :delayed_job_workers, 2
 
-# Config files should be copied by deploy:setup_config
 set(:config_files, %w(
   log_rotation
   database.yml
   secrets.yml
   unicorn.rb
-  sidekiq.yml
 ))
 
 set :whenever_roles, -> { :cron }
 
 namespace :deploy do
-  # Check right version of deploy branch
-  # before :deploy, "deploy:check_revision"
-  # Run test aund continue only if passed
-  # before :deploy, "deploy:run_tests"
+  before :starting, 'rvm1:install:rvm'  # install/update RVM
+  before :starting, 'rvm1:install:ruby' # install Ruby and create gemset
+  before :starting, 'install_bundler_gem' # install bundler gem
 
-  # Custom compile and rsync of assets - works, but it is very slow
-  #after 'deploy:symlink:shared', 'deploy:compile_assets_locally'
+  after :publishing, 'deploy:restart'
+  after :published, 'delayed_job:restart'
 
   after :finishing, 'deploy:cleanup'
-  # Restart unicorn
-  after 'deploy:publishing', 'deploy:restart'
-  # Restart Delayed Jobs
-  after 'deploy:published', 'delayed_job:restart'
 end
+
+task :install_bundler_gem do
+  on roles(:app) do
+    execute "rvm use #{fetch(:rvm1_ruby_version)}; gem install bundler"
+  end
+end
\ No newline at end of file
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 29682e8e1..30e282fec 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -59,4 +59,4 @@ Rails.application.configure do
     end
   end
 
-end
+end
\ No newline at end of file
diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index 9b675ffd0..eeaec8f77 100644
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -3,7 +3,7 @@
 # The "main" locale.
 base_locale: en
 ## All available locales are inferred from the data by default. Alternatively, specify them explicitly:
-# locales: [es, fr]
+locales: [en, es]
 ## Reporting locale, default: en. Available: en, ru.
 # internal_locale: en
 
@@ -103,6 +103,7 @@ ignore_missing:
   - 'errors.messages.taken'
   - 'devise.failure.invalid'
   - 'devise.registrations.destroyed'
+  - 'devise.password_expired.*'
 
 ## Consider these keys used:
 ignore_unused:
diff --git a/config/initializers/acts_as_taggable_on.rb b/config/initializers/acts_as_taggable_on.rb
index 5cf75b8bb..dc144023c 100644
--- a/config/initializers/acts_as_taggable_on.rb
+++ b/config/initializers/acts_as_taggable_on.rb
@@ -52,4 +52,4 @@ module ActsAsTaggableOn
       end
   end
 
-end
+end
\ No newline at end of file
diff --git a/config/initializers/devise_security_extension.rb b/config/initializers/devise_security_extension.rb
new file mode 100644
index 000000000..6e691acbe
--- /dev/null
+++ b/config/initializers/devise_security_extension.rb
@@ -0,0 +1,71 @@
+Devise.setup do |config|
+  # ==> Security Extension
+  # Configure security extension for devise
+
+  # Should the password expire (e.g 3.months)
+  # config.expire_password_after = false
+  config.expire_password_after = 1.year
+
+  # Need 1 char of A-Z, a-z and 0-9
+  # config.password_regex = /(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])/
+
+  # How many passwords to keep in archive
+  #config.password_archiving_count = 5
+
+  # Deny old password (true, false, count)
+  # config.deny_old_passwords = true
+
+  # enable email validation for :secure_validatable. (true, false, validation_options)
+  # dependency: need an email validator like rails_email_validator
+  # config.email_validation = true
+  # captcha integration for recover form
+  # config.captcha_for_recover = true
+
+  # captcha integration for sign up form
+  # config.captcha_for_sign_up = true
+
+  # captcha integration for sign in form
+  # config.captcha_for_sign_in = true
+
+  # captcha integration for unlock form
+  # config.captcha_for_unlock = true
+
+  # captcha integration for confirmation form
+  # config.captcha_for_confirmation = true
+
+  # Time period for account expiry from last_activity_at
+  # config.expire_after = 90.days
+end
+
+module Devise
+  module Models
+    module PasswordExpirable
+      def need_change_password?
+        self.administrator? && password_expired?
+      end 
+
+      def password_expired?
+        self.password_changed_at < self.expire_password_after.ago
+      end
+    end
+
+    module SecureValidatable
+      def self.included(base)
+        base.extend ClassMethods
+        assert_secure_validations_api!(base)
+        base.class_eval do
+          validate :current_equal_password_validation
+        end
+      end
+
+      def current_equal_password_validation
+        if !self.new_record? && !self.encrypted_password_change.nil? && !self.erased?
+          dummy = self.class.new
+          dummy.encrypted_password = self.encrypted_password_change.first
+          dummy.password_salt = self.password_salt_change.first if self.respond_to? :password_salt_change and not self.password_salt_change.nil?
+          self.errors.add(:password, :equal_to_current_password) if dummy.valid_password?(self.password)
+        end
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/config/locales/activerecord.en.yml b/config/locales/activerecord.en.yml
index 8eb300289..8961ee584 100644
--- a/config/locales/activerecord.en.yml
+++ b/config/locales/activerecord.en.yml
@@ -66,6 +66,7 @@ en:
         username: "Username"
         password_confirmation: "Password confirmation"
         password: "Password"
+        current_password: "Current password"
         phone_number: "Phone number"
         official_position: "Official position"
         official_level: "Official level"
diff --git a/config/locales/activerecord.es.yml b/config/locales/activerecord.es.yml
index 50ef09cf4..44a7f1d42 100644
--- a/config/locales/activerecord.es.yml
+++ b/config/locales/activerecord.es.yml
@@ -66,6 +66,7 @@ es:
         username: "Nombre de usuario"
         password_confirmation: "Confirmación de contraseña"
         password: "Contraseña"
+        current_password: "Contraseña actual"
         phone_number: "Teléfono"
         official_position: "Cargo público"
         official_level: "Nivel del cargo"
diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml
index 30fb488ce..29bc0a620 100755
--- a/config/locales/devise.en.yml
+++ b/config/locales/devise.en.yml
@@ -2,6 +2,12 @@
 
 en:
   devise:
+    password_expired:
+      expire_password: "Password expired"
+      change_required: "Your password is expired"
+      change_password: "Change your password"
+      new_password: "New password"
+      updated: "Password successfully updated"
     confirmations:
       confirmed: "Your account has been confirmed."
       send_instructions: "In a few minutes you will receive an email containing instructions on how to reset your password."
@@ -62,3 +68,4 @@ en:
       not_saved:
         one: "1 error prevented this %{resource} from being saved:"
         other: "%{count} errors prevented this %{resource} from being saved:"
+      equal_to_current_password: "must be different than the current password."
diff --git a/config/locales/devise.es.yml b/config/locales/devise.es.yml
index 1a9c3a3b8..6ede31f7d 100644
--- a/config/locales/devise.es.yml
+++ b/config/locales/devise.es.yml
@@ -1,5 +1,11 @@
 es:
   devise:
+    password_expired:
+      expire_password: "Contraseña caducada"
+      change_required: "Tu contraseña ha caducado"
+      change_password: "Cambia tu contraseña"
+      new_password: "Nueva contraseña"
+      updated: "Contraseña actualizada con éxito"
     confirmations:
       confirmed: "Tu cuenta ha sido confirmada. Por favor autentifícate con tu red social o tu usuario y contraseña"
       send_instructions: "Recibirás un correo electrónico en unos minutos con instrucciones sobre cómo restablecer tu contraseña."
@@ -60,3 +66,4 @@ es:
       not_saved:
         one: "1 error impidió que este %{resource} fuera guardado:"
         other: "%{count} errores impidieron que este %{resource} fuera guardado:"
+      equal_to_current_password: "debe ser diferente a la contraseña actual"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 52cdbc99d..5379484be 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -209,6 +209,7 @@ en:
       open_data: Open data
       open_gov: Open government
       proposals: Proposals
+      proposal_ballot: Voting
       see_all: See proposals
       budgets: Participatory budgeting
   legislation:
@@ -301,6 +302,7 @@ en:
         hot_score: most active
         most_commented: most commented
         relevance: relevance
+        archival_date: Archived
       retired_proposals: Retired proposals
       retired_proposals_link: "Proposals retired by the author"
       retired_links:
@@ -341,7 +343,7 @@ en:
         other: "%{count} comments"
         zero: No comments
       proposal: Proposal
-      reason_for_supports_necessary: 2% of Census
+      reason_for_supports_necessary: 1% of Census
       support: Support
       support_title: Support this proposal
       supports:
@@ -350,6 +352,7 @@ en:
         zero: No supports
       supports_necessary: "%{number} supports needed"
       total_percent: 100%
+      archived: "This proposal has been archived and can't collect supports."
     show:
       author_deleted: User deleted
       code: 'Proposal code:'
@@ -371,6 +374,17 @@ en:
     update:
       form:
         submit_button: Save changes
+  proposal_ballots:
+    title: "Votings"
+    description_html: "The following citizen proposals that have reached the <strong>required supports</strong> and will be voted."
+    date_title: "Dates of participation"
+    date: "Soon we'll announce the date of vote these proposals."
+    successfull: "This proposal has reached the required supports and will be voted in the %{voting}."
+    voting: "next voting"
+    featured_title: "#NextVoting"
+    nothing_to_vote: "There is nothing to vote at the moment."
+    info: "New proposals that have reached the voting phase."
+    button: "I want to decide"
   proposal_notifications:
     new:
       title: "Send message"
@@ -435,6 +449,12 @@ en:
       categories: "Categories"
     target_blank_html: " (link opens in new window)"
     unflag: Unflag
+    outline:
+      debates: Debates
+      proposals: Proposals
+      budget: Participatory budget
+      pagination: Pagination
+      searcher: Searcher
   social:
     blog: Blog
     facebook: Facebook
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 0346fabb0..a1edcfc77 100755
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -209,6 +209,7 @@ es:
       open_data: Datos abiertos
       open_gov: Gobierno %{open}
       proposals: Propuestas
+      proposal_ballot: Votaciones
       see_all: Ver propuestas
       budgets: Presupuestos ciudadanos
   legislation:
@@ -301,6 +302,7 @@ es:
         hot_score: Más activas hoy
         most_commented: Más comentadas
         relevance: Más relevantes
+        archival_date: Archivadas
       retired_proposals: Propuestas retiradas
       retired_proposals_link: "Propuestas retiradas por sus autores"
       retired_links:
@@ -341,7 +343,7 @@ es:
         other: "%{count} Comentarios"
         zero: Sin comentarios
       proposal: Propuesta
-      reason_for_supports_necessary: 2% del Censo
+      reason_for_supports_necessary: 1% del Censo
       support: Apoyar
       support_title: Apoyar esta propuesta
       supports:
@@ -350,6 +352,7 @@ es:
         zero: Sin apoyos
       supports_necessary: "%{number} apoyos necesarios"
       total_percent: 100%
+      archived: "Esta propuesta ha sido archivada y ya no puede recoger apoyos."
     show:
       author_deleted: Usuario eliminado
       code: 'Código de la propuesta:'
@@ -371,6 +374,17 @@ es:
     update:
       form:
         submit_button: Guardar cambios
+  proposal_ballots:
+    title: "Votaciones"
+    description_html: "Las siguientes propuestas ciudadanas han alcanzado el <strong>número de apoyos necesarios</strong> y pasarán a votación."
+    date_title: "Fechas de participación"
+    date: "En breve anunciaremos la fecha de votación de estas propuestas."
+    successfull: "Esta propuesta ha alcanzado los apoyos necesarios y pasará a la %{voting}."
+    voting: "próxima votación"
+    featured_title: "#PróximaVotación"
+    nothing_to_vote: "No hay nada que votar en este momento."
+    info: "Nuevas propuestas ciudadanas han llegado a la fase de votación."
+    button: "Quiero decidir"
   proposal_notifications:
     new:
       title: "Enviar mensaje"
@@ -435,6 +449,12 @@ es:
       categories: "Categorías"
     target_blank_html: " (se abre en ventana nueva)"
     unflag: Deshacer denuncia
+    outline:
+      debates: Debates
+      proposals: Propuestas
+      budget: Presupuestos ciudadanos
+      pagination: Paginación
+      searcher: Buscador
   social:
     blog: Blog
     facebook: Facebook
diff --git a/doc/locales/fr.yaml b/config/locales/fr.yml
similarity index 99%
rename from doc/locales/fr.yaml
rename to config/locales/fr.yml
index 399a4e60c..b70c4648d 100644
--- a/doc/locales/fr.yaml
+++ b/config/locales/fr.yml
@@ -1316,7 +1316,7 @@ fr:
         other: "%{count} commentaires"
         zero: Aucun commentaire
       proposal: Proposition
-      reason_for_supports_necessary: 2% du Recensement
+      reason_for_supports_necessary: 1% du Recensement
       support: Soutenir
       supports:
         one: 1 soutien
diff --git a/config/locales/pages.en.yml b/config/locales/pages.en.yml
index 2374e3d4b..4ac76b1d3 100755
--- a/config/locales/pages.en.yml
+++ b/config/locales/pages.en.yml
@@ -39,7 +39,7 @@ en:
 
           The proposals can be supported by every citizen registered that has verified their account in the participation platform. In this way, the citizenship, and not someone in its name, will decide which are the proposals that are worthwhile to carry out.
 
-          One that the proposal has achive support of 2% census, it will be studied by a city council group and to move beyond the popular referendum phase, in which citizenship will vote if it is carried out or not. The maximum period to obtain support enough is 12 months.
+          One that the proposal has achive support of 1% census, it will be studied by a city council group and to move beyond the popular referendum phase, in which citizenship will vote if it is carried out or not. The maximum period to obtain support enough is 12 months.
       how_to_use:
         text: |-
           Use it in your local government or help us to improve it, it is free software.
diff --git a/config/locales/pages.es.yml b/config/locales/pages.es.yml
index 3876e8a1b..e3e82effa 100644
--- a/config/locales/pages.es.yml
+++ b/config/locales/pages.es.yml
@@ -39,7 +39,7 @@ es:
 
           Las propuestas pueden ser apoyadas por ciudadanos empadronados que hayan verificado su cuenta en la plataforma de participación, de tal manera que será la propia ciudadanía, y nadie en su nombre, la que decida cuáles son las propuestas que merecen la pena ser llevadas a cabo.
 
-          Una vez que una propuesta alcance una cantidad de apoyos equivalente al 2% del censo, automáticamente pasa a ser estudiada por un grupo de trabajo del Ayuntamiento y pasará a la siguiente fase de consulta popular, en la que la ciudadanía votará si se lleva a cabo o no. El plazo máximo para recabar los apoyos necesarios será de 12 meses.
+          Una vez que una propuesta alcance una cantidad de apoyos equivalente al 1% del censo, automáticamente pasa a ser estudiada por un grupo de trabajo del Ayuntamiento y pasará a la siguiente fase de consulta popular, en la que la ciudadanía votará si se lleva a cabo o no. El plazo máximo para recabar los apoyos necesarios será de 12 meses.
       how_to_use:
         text: |-
           Utilízalo en tu municipio libremente o ayúdanos a mejorarlo, es software libre.
diff --git a/doc/locales/pt-br.yaml b/config/locales/pt-BR.yml
similarity index 99%
rename from doc/locales/pt-br.yaml
rename to config/locales/pt-BR.yml
index 9d2b3ee46..831c9a556 100644
--- a/doc/locales/pt-br.yaml
+++ b/config/locales/pt-BR.yml
@@ -1,5 +1,8 @@
 ---
 pt-BR:
+  i18n:
+    language:
+      name: Português
   account:
     show:
       change_credentials_link: Alterar meus dados pessoais
@@ -1211,8 +1214,8 @@ pt-BR:
           podem ser apoiadas por todos os cidadãos registrados em Madrid que verificaram
           a sua conta na plataforma de participação. Desta forma, a cidadania e não
           alguém em seu nome, irá decidir quais são as propostas que valem a pena
-          levar a cabo.\r\n\r\nAssim que a proposta atingir o apoio de 2% Madrid recenseada
-          (cerca de 53.000 pessoas), será estudado por um grupo conselheiro da cidade,
+          levar a cabo.\r\n\r\nAssim que a proposta atingir o apoio de 1% Madrid recenseada
+          (cerca de 28.000 pessoas), será estudado por um grupo conselheiro da cidade,
           avançar além da fase de consulta popular, em que a cidadania de Madrid vai
           votar se a proposta será realizada ou não. O prazo máximo para obter apoio
           suficiente é de 12 meses."
@@ -1336,7 +1339,7 @@ pt-BR:
         other: "%{count} comentários"
         zero: Nenhum comentário
       proposal: Proposta
-      reason_for_supports_necessary: 2% do Censo
+      reason_for_supports_necessary: 1% do Censo
       support: Apoiar
       supports:
         one: 1 apoio
diff --git a/config/locales/settings.en.yml b/config/locales/settings.en.yml
index 31f0d8add..f1e8f7e77 100755
--- a/config/locales/settings.en.yml
+++ b/config/locales/settings.en.yml
@@ -11,10 +11,22 @@ en:
     max_votes_for_debate_edit: "Number of votes from which a Debate can no longer be edited"
     proposal_code_prefix: "Prefix for Proposal codes"
     votes_for_proposal_success: "Number of votes necessary for approval of a Proposal"
+    months_to_archive_proposals: "Months to archive Proposals"
     email_domain_for_officials: "Email domain for public officials"
     per_page_code: "Code to be included on every page"
+    twitter_handle: "Twitter handle"
+    twitter_hashtag: "Twitter hashtag"
+    facebook_handle: "Facebook handle"
+    youtube_handle: "Youtube handle"
+    blog_url: "Blog URL"
+    url: "Main URL"
+    org_name: "Organization"
+    place_name: "Place"
     feature:
       budgets: Participatory budgeting
+      twitter_login: Twitter login
+      facebook_login: Facebook login
+      google_login: Google login
       debates: Debates
       spending_proposals: Investment projects
       spending_proposal_features:
diff --git a/config/locales/settings.es.yml b/config/locales/settings.es.yml
index 532fb878e..f9c0c41ff 100644
--- a/config/locales/settings.es.yml
+++ b/config/locales/settings.es.yml
@@ -11,11 +11,23 @@ es:
     max_votes_for_debate_edit: "Número de votos en que un Debate deja de poderse editar"
     proposal_code_prefix: "Prefijo para los códigos de Propuestas"
     votes_for_proposal_success: "Número de votos necesarios para aprobar una Propuesta"
+    months_to_archive_proposals: "Meses para archivar las Propuestas"
     email_domain_for_officials: "Dominio de email para cargos públicos"
     per_page_code: "Código a incluir en cada página"
+    twitter_handle: "Usuario de Twitter"
+    twitter_hashtag: "Hashtag para Twitter"
+    facebook_handle: "Identificador de Facebook"
+    youtube_handle: "Usuario de Youtube"
+    blog_url: "URL del blog"
+    url: "URL general de la web"
+    org_name: "Nombre de la organización"
+    place_name: "Nombre del lugar"
     feature:
       budgets: Presupuestos participativos
+      twitter_login: Registro con Twitter
+      facebook_login: Registro con Facebook
+      google_login: Registro con Google
       debates: Debates
       spending_proposals: Propuestas de inversión
       spending_proposal_features:
-        voting_allowed: Votaciones sobre propuestas de inversión
\ No newline at end of file
+        voting_allowed: Votaciones sobre propuestas de inversión
diff --git a/config/routes.rb b/config/routes.rb
index 50294501a..90decfb7e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -61,6 +61,8 @@ Rails.application.routes.draw do
     end
   end
 
+  resources :proposal_ballots, only: [:index]
+
   resources :comments, only: [:create, :show], shallow: true do
     member do
       post :vote
diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb
index f3de46d3b..6ca056a33 100644
--- a/db/dev_seeds.rb
+++ b/db/dev_seeds.rb
@@ -13,6 +13,7 @@ Setting.create(key: 'max_votes_for_debate_edit', value: '1000')
 Setting.create(key: 'max_votes_for_proposal_edit', value: '1000')
 Setting.create(key: 'proposal_code_prefix', value: 'MAD')
 Setting.create(key: 'votes_for_proposal_success', value: '100')
+Setting.create(key: 'months_to_archive_proposals', value: '12')
 Setting.create(key: 'comments_body_max_length', value: '1000')
 
 Setting.create(key: 'twitter_handle', value: '@consul_dev')
@@ -41,7 +42,7 @@ puts "Creating Users"
 def create_user(email, username = Faker::Name.name)
   pwd = '12345678'
   puts "    #{username}"
-  User.create!(username: username, email: email, password: pwd, password_confirmation: pwd, confirmed_at: Time.now, terms_of_service: "1")
+  User.create!(username: username, email: email, password: pwd, password_confirmation: pwd, confirmed_at: Time.current, terms_of_service: "1")
 end
 
 admin = create_user('admin@consul.dev', 'admin')
@@ -54,10 +55,10 @@ valuator = create_user('valuator@consul.dev', 'valuator')
 valuator.create_valuator
 
 level_2 = create_user('leveltwo@consul.dev', 'level 2')
-level_2.update(residence_verified_at: Time.now, confirmed_phone: Faker::PhoneNumber.phone_number, document_number: "2222222222", document_type: "1" )
+level_2.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_number: "2222222222", document_type: "1" )
 
 verified = create_user('verified@consul.dev', 'verified')
-verified.update(residence_verified_at: Time.now, confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1", verified_at: Time.now, document_number: "3333333333")
+verified.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1", verified_at: Time.current, document_number: "3333333333")
 
 (1..10).each do |i|
   org_name = Faker::Company.name
@@ -80,12 +81,12 @@ end
 
 (1..40).each do |i|
   user = create_user("user#{i}@consul.dev")
-  level = [1,2,3].sample
-  if level >= 2 then
-    user.update(residence_verified_at: Time.now, confirmed_phone: Faker::PhoneNumber.phone_number, document_number: Faker::Number.number(10), document_type: "1" )
+  level = [1, 2, 3].sample
+  if level >= 2
+    user.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_number: Faker::Number.number(10), document_type: "1" )
   end
-  if level == 3 then
-    user.update(verified_at: Time.now, document_number: Faker::Number.number(10) )
+  if level == 3
+    user.update(verified_at: Time.current, document_number: Faker::Number.number(10) )
   end
 end
 
@@ -113,12 +114,12 @@ ActsAsTaggableOn::Tag.create!(name:  "Medio Ambiente", featured: true, kind: "ca
 puts "Creating Debates"
 
 tags = Faker::Lorem.words(25)
-(1..30).each do |i|
+(1..30).each do
   author = User.reorder("RANDOM()").first
   description = "<p>#{Faker::Lorem.paragraphs.join('</p><p>')}</p>"
   debate = Debate.create!(author: author,
                           title: Faker::Lorem.sentence(3).truncate(60),
-                          created_at: rand((Time.now - 1.week) .. Time.now),
+                          created_at: rand((Time.current - 1.week) .. Time.current),
                           description: description,
                           tag_list: tags.sample(3).join(','),
                           geozone: Geozone.reorder("RANDOM()").first,
@@ -128,12 +129,12 @@ end
 
 
 tags = ActsAsTaggableOn::Tag.where(kind: 'category')
-(1..30).each do |i|
+(1..30).each do
   author = User.reorder("RANDOM()").first
   description = "<p>#{Faker::Lorem.paragraphs.join('</p><p>')}</p>"
   debate = Debate.create!(author: author,
                           title: Faker::Lorem.sentence(3).truncate(60),
-                          created_at: rand((Time.now - 1.week) .. Time.now),
+                          created_at: rand((Time.current - 1.week) .. Time.current),
                           description: description,
                           tag_list: tags.sample(3).join(','),
                           geozone: Geozone.reorder("RANDOM()").first,
@@ -150,31 +151,52 @@ tags = Faker::Lorem.words(25)
   description = "<p>#{Faker::Lorem.paragraphs.join('</p><p>')}</p>"
   proposal = Proposal.create!(author: author,
                               title: Faker::Lorem.sentence(3).truncate(60),
-                              question: Faker::Lorem.sentence(4),
+                              question: Faker::Lorem.sentence(3) + "?",
                               summary: Faker::Lorem.sentence(3),
                               responsible_name: Faker::Name.name,
                               external_url: Faker::Internet.url,
                               description: description,
-                              created_at: rand((Time.now - 1.week) .. Time.now),
+                              created_at: rand((Time.current - 1.week) .. Time.current),
                               tag_list: tags.sample(3).join(','),
                               geozone: Geozone.reorder("RANDOM()").first,
                               terms_of_service: "1")
   puts "    #{proposal.title}"
 end
 
+puts "Creating Archived Proposals"
 
-tags = ActsAsTaggableOn::Tag.where(kind: 'category')
-(1..30).each do |i|
+tags = Faker::Lorem.words(25)
+(1..5).each do
   author = User.reorder("RANDOM()").first
   description = "<p>#{Faker::Lorem.paragraphs.join('</p><p>')}</p>"
   proposal = Proposal.create!(author: author,
                               title: Faker::Lorem.sentence(3).truncate(60),
-                              question: Faker::Lorem.sentence(4),
+                              question: Faker::Lorem.sentence(3) + "?",
                               summary: Faker::Lorem.sentence(3),
                               responsible_name: Faker::Name.name,
                               external_url: Faker::Internet.url,
                               description: description,
-                              created_at: rand((Time.now - 1.week) .. Time.now),
+                              created_at: rand((Time.current - 1.week) .. Time.current),
+                              tag_list: tags.sample(3).join(','),
+                              geozone: Geozone.reorder("RANDOM()").first,
+                              terms_of_service: "1",
+                              created_at: Setting["months_to_archive_proposals"].to_i.months.ago)
+  puts "    #{proposal.title}"
+end
+
+
+tags = ActsAsTaggableOn::Tag.where(kind: 'category')
+(1..30).each do
+  author = User.reorder("RANDOM()").first
+  description = "<p>#{Faker::Lorem.paragraphs.join('</p><p>')}</p>"
+  proposal = Proposal.create!(author: author,
+                              title: Faker::Lorem.sentence(3).truncate(60),
+                              question: Faker::Lorem.sentence(3) + "?",
+                              summary: Faker::Lorem.sentence(3),
+                              responsible_name: Faker::Name.name,
+                              external_url: Faker::Internet.url,
+                              description: description,
+                              created_at: rand((Time.current - 1.week) .. Time.current),
                               tag_list: tags.sample(3).join(','),
                               geozone: Geozone.reorder("RANDOM()").first,
                               terms_of_service: "1")
@@ -184,11 +206,11 @@ end
 
 puts "Commenting Debates"
 
-(1..100).each do |i|
+(1..100).each do
   author = User.reorder("RANDOM()").first
   debate = Debate.reorder("RANDOM()").first
   Comment.create!(user: author,
-                  created_at: rand(debate.created_at .. Time.now),
+                  created_at: rand(debate.created_at .. Time.current),
                   commentable: debate,
                   body: Faker::Lorem.sentence)
 end
@@ -200,7 +222,7 @@ puts "Commenting Proposals"
   author = User.reorder("RANDOM()").first
   proposal = Proposal.reorder("RANDOM()").first
   Comment.create!(user: author,
-                  created_at: rand(proposal.created_at .. Time.now),
+                  created_at: rand(proposal.created_at .. Time.current),
                   commentable: proposal,
                   body: Faker::Lorem.sentence)
 end
@@ -208,11 +230,11 @@ end
 
 puts "Commenting Comments"
 
-(1..200).each do |i|
+(1..200).each do
   author = User.reorder("RANDOM()").first
   parent = Comment.reorder("RANDOM()").first
   Comment.create!(user: author,
-                  created_at: rand(parent.created_at .. Time.now),
+                  created_at: rand(parent.created_at .. Time.current),
                   commentable_id: parent.commentable_id,
                   commentable_type: parent.commentable_type,
                   body: Faker::Lorem.sentence,
@@ -222,7 +244,7 @@ end
 
 puts "Voting Debates, Proposals & Comments"
 
-(1..100).each do |i|
+(1..100).each do
   voter  = not_org_users.reorder("RANDOM()").first
   vote   = [true, false].sample
   debate = Debate.reorder("RANDOM()").first
@@ -236,7 +258,7 @@ end
   comment.vote_by(voter: voter, vote: vote)
 end
 
-(1..100).each do |i|
+(1..100).each do
   voter  = User.level_two_or_three_verified.reorder("RANDOM()").first
   proposal = Proposal.reorder("RANDOM()").first
   proposal.vote_by(voter: voter, vote: true)
@@ -245,19 +267,19 @@ end
 
 puts "Flagging Debates & Comments"
 
-(1..40).each do |i|
+(1..40).each do
   debate = Debate.reorder("RANDOM()").first
   flagger = User.where(["users.id <> ?", debate.author_id]).reorder("RANDOM()").first
   Flag.flag(flagger, debate)
 end
 
-(1..40).each do |i|
+(1..40).each do
   comment = Comment.reorder("RANDOM()").first
   flagger = User.where(["users.id <> ?", comment.user_id]).reorder("RANDOM()").first
   Flag.flag(flagger, comment)
 end
 
-(1..40).each do |i|
+(1..40).each do
   proposal = Proposal.reorder("RANDOM()").first
   flagger = User.where(["users.id <> ?", proposal.author_id]).reorder("RANDOM()").first
   Flag.flag(flagger, proposal)
@@ -267,7 +289,7 @@ puts "Creating Spending Proposals"
 
 tags = Faker::Lorem.words(10)
 
-(1..10).each do |i|
+(1..60).each do
   geozone = Geozone.reorder("RANDOM()").first
   author = User.reorder("RANDOM()").first
   description = "<p>#{Faker::Lorem.paragraphs.join('</p><p>')}</p>"
@@ -278,7 +300,7 @@ tags = Faker::Lorem.words(10)
                               title: Faker::Lorem.sentence(3).truncate(60),
                               external_url: Faker::Internet.url,
                               description: description,
-                              created_at: rand((Time.now - 1.week) .. Time.now),
+                              created_at: rand((Time.current - 1.week) .. Time.current),
                               geozone: [geozone, nil].sample,
                               feasible: feasible,
                               feasible_explanation: feasible_explanation,
@@ -390,8 +412,8 @@ Proposal.last(3).each do |proposal|
                           image: ["banner-img banner-img-one", "banner-img banner-img-two",
                                   "banner-img banner-img-three"].sample,
                           target_url: Rails.application.routes.url_helpers.proposal_path(proposal),
-                          post_started_at: rand((Time.now - 1.week) .. (Time.now - 1.day)),
-                          post_ended_at:   rand((Time.now  - 1.day) .. (Time.now + 1.week)),
-                          created_at: rand((Time.now - 1.week) .. Time.now))
+                          post_started_at: rand((Time.current - 1.week) .. (Time.current - 1.day)),
+                          post_ended_at:   rand((Time.current  - 1.day) .. (Time.current + 1.week)),
+                          created_at: rand((Time.current - 1.week) .. Time.current))
   puts "    #{banner.title}"
 end
diff --git a/db/migrate/20150716174358_devise_create_users.rb b/db/migrate/20150716174358_devise_create_users.rb
index 74adf30cd..c18355f3d 100644
--- a/db/migrate/20150716174358_devise_create_users.rb
+++ b/db/migrate/20150716174358_devise_create_users.rb
@@ -30,7 +30,6 @@ class DeviseCreateUsers < ActiveRecord::Migration
       # t.string   :unlock_token # Only if unlock strategy is :email or :both
       # t.datetime :locked_at
 
-
       t.timestamps null: false
     end
 
diff --git a/db/migrate/20150808141306_create_simple_captcha_data.rb b/db/migrate/20150808141306_create_simple_captcha_data.rb
index 4573b2056..d636631f0 100644
--- a/db/migrate/20150808141306_create_simple_captcha_data.rb
+++ b/db/migrate/20150808141306_create_simple_captcha_data.rb
@@ -1,12 +1,12 @@
 class CreateSimpleCaptchaData < ActiveRecord::Migration
   def self.up
     create_table :simple_captcha_data do |t|
-      t.string :key, :limit => 40
-      t.string :value, :limit => 6
+      t.string :key, limit: 40
+      t.string :value, limit: 6
       t.timestamps
     end
-    
-    add_index :simple_captcha_data, :key, :name => "idx_key"
+
+    add_index :simple_captcha_data, :key, name: "idx_key"
   end
 
   def self.down
diff --git a/db/migrate/20150820103351_create_inappropiate_flags.rb b/db/migrate/20150820103351_create_inappropiate_flags.rb
index 982d9f705..45bb5cba8 100644
--- a/db/migrate/20150820103351_create_inappropiate_flags.rb
+++ b/db/migrate/20150820103351_create_inappropiate_flags.rb
@@ -1,12 +1,12 @@
 class CreateInappropiateFlags < ActiveRecord::Migration
   def change
-     create_table :inappropiate_flags do |t|
-       t.belongs_to :user, index: true, foreign_key: true
+    create_table :inappropiate_flags do |t|
+      t.belongs_to :user, index: true, foreign_key: true
 
-       t.string :flaggable_type
-       t.integer :flaggable_id
+      t.string :flaggable_type
+      t.integer :flaggable_id
 
-       t.timestamps
+      t.timestamps
     end
 
     add_index :inappropiate_flags, [:flaggable_type, :flaggable_id]
diff --git a/db/migrate/20160114110933_create_tolk_tables.rb b/db/migrate/20160114110933_create_tolk_tables.rb
index 160000ab0..d5e6db9d4 100644
--- a/db/migrate/20160114110933_create_tolk_tables.rb
+++ b/db/migrate/20160114110933_create_tolk_tables.rb
@@ -6,7 +6,7 @@ class CreateTolkTables < ActiveRecord::Migration
       t.datetime :updated_at
     end
 
-    add_index :tolk_locales, :name, :unique => true
+    add_index :tolk_locales, :name, unique: true
 
     create_table :tolk_phrases do |t|
       t.text     :key
@@ -19,17 +19,17 @@ class CreateTolkTables < ActiveRecord::Migration
       t.integer  :locale_id
       t.text     :text
       t.text     :previous_text
-      t.boolean  :primary_updated, :default => false
+      t.boolean  :primary_updated, default: false
       t.datetime :created_at
       t.datetime :updated_at
     end
 
-    add_index :tolk_translations, [:phrase_id, :locale_id], :unique => true
+    add_index :tolk_translations, [:phrase_id, :locale_id], unique: true
   end
 
   def self.down
-    remove_index :tolk_translations, :column => [:phrase_id, :locale_id]
-    remove_index :tolk_locales, :column => :name
+    remove_index :tolk_translations, column: [:phrase_id, :locale_id]
+    remove_index :tolk_locales, column: :name
 
     drop_table :tolk_translations
     drop_table :tolk_phrases
diff --git a/db/migrate/20160204134022_add_tsvector_to_debates.rb b/db/migrate/20160204134022_add_tsvector_to_debates.rb
index 1f15e4d6b..7b697347c 100644
--- a/db/migrate/20160204134022_add_tsvector_to_debates.rb
+++ b/db/migrate/20160204134022_add_tsvector_to_debates.rb
@@ -10,4 +10,4 @@ class AddTsvectorToDebates < ActiveRecord::Migration
     remove_column :debates, :tsv
   end
 
-end
+end
\ No newline at end of file
diff --git a/db/migrate/20160329160106_add_tsvector_to_spending_proposals.rb b/db/migrate/20160329160106_add_tsvector_to_spending_proposals.rb
index 080a8ebc9..c8c3d7f3e 100644
--- a/db/migrate/20160329160106_add_tsvector_to_spending_proposals.rb
+++ b/db/migrate/20160329160106_add_tsvector_to_spending_proposals.rb
@@ -5,4 +5,4 @@ class AddTsvectorToSpendingProposals < ActiveRecord::Migration
     add_index :spending_proposals, :tsv, using: "gin"
   end
 
-end
+end
\ No newline at end of file
diff --git a/db/migrate/20160901104320_add_password_expired.rb b/db/migrate/20160901104320_add_password_expired.rb
new file mode 100644
index 000000000..aa759dd61
--- /dev/null
+++ b/db/migrate/20160901104320_add_password_expired.rb
@@ -0,0 +1,6 @@
+class AddPasswordExpired < ActiveRecord::Migration
+  def change
+    add_column :users, :password_changed_at, :datetime
+    add_index :users, :password_changed_at
+  end
+end
diff --git a/db/migrate/20161102133838_default_password_changed_at.rb b/db/migrate/20161102133838_default_password_changed_at.rb
new file mode 100644
index 000000000..9df2a26a6
--- /dev/null
+++ b/db/migrate/20161102133838_default_password_changed_at.rb
@@ -0,0 +1,5 @@
+class DefaultPasswordChangedAt < ActiveRecord::Migration
+  def change
+    change_column :users, :password_changed_at, :datetime, null: false, default: Time.now
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 982f850d3..3668e1ebf 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160905092539) do
+ActiveRecord::Schema.define(version: 20161102133838) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -501,17 +501,17 @@ ActiveRecord::Schema.define(version: 20160905092539) do
 
   create_table "users", force: :cascade do |t|
     t.string   "email",                                     default: ""
-    t.string   "encrypted_password",                        default: "",    null: false
+    t.string   "encrypted_password",                        default: "",                    null: false
     t.string   "reset_password_token"
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",                             default: 0,     null: false
+    t.integer  "sign_in_count",                             default: 0,                     null: false
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
     t.string   "current_sign_in_ip"
     t.string   "last_sign_in_ip"
-    t.datetime "created_at",                                                null: false
-    t.datetime "updated_at",                                                null: false
+    t.datetime "created_at",                                                                null: false
+    t.datetime "updated_at",                                                                null: false
     t.string   "confirmation_token"
     t.datetime "confirmed_at"
     t.datetime "confirmation_sent_at"
@@ -552,12 +552,14 @@ ActiveRecord::Schema.define(version: 20160905092539) do
     t.boolean  "email_digest",                              default: true
     t.boolean  "email_on_direct_message",                   default: true
     t.boolean  "official_position_badge",                   default: false
+    t.datetime "password_changed_at",                       default: '2016-11-02 13:51:14', null: false
   end
 
   add_index "users", ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true, using: :btree
   add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree
   add_index "users", ["geozone_id"], name: "index_users_on_geozone_id", using: :btree
   add_index "users", ["hidden_at"], name: "index_users_on_hidden_at", using: :btree
+  add_index "users", ["password_changed_at"], name: "index_users_on_password_changed_at", using: :btree
   add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree
   add_index "users", ["username"], name: "index_users_on_username", using: :btree
 
diff --git a/db/seeds.rb b/db/seeds.rb
index 45a7ff81f..e3bde8275 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -1,7 +1,7 @@
 # coding: utf-8
 # Default admin user (change password after first deploy to a server!)
 if Administrator.count == 0 && !Rails.env.test?
-  admin = User.create!(username: 'admin', email: 'admin@consul.dev', password: '12345678', password_confirmation: '12345678', confirmed_at: Time.now, terms_of_service: "1")
+  admin = User.create!(username: 'admin', email: 'admin@consul.dev', password: '12345678', password_confirmation: '12345678', confirmed_at: Time.current, terms_of_service: "1")
   admin.create_administrator
 end
 
@@ -31,6 +31,9 @@ Setting["proposal_code_prefix"] = 'MAD'
 # Number of votes needed for proposal success
 Setting["votes_for_proposal_success"] = 53726
 
+# Months to archive proposals
+Setting["months_to_archive_proposals"] = 12
+
 # Users with this email domain will automatically be marked as level 1 officials
 # Emails under the domain's subdomains will also be included
 Setting["email_domain_for_officials"] = ''
@@ -78,4 +81,4 @@ Setting['banner-img.banner-img-three'] = "Banner image 3"
 
 # Proposal notifications
 Setting['proposal_notification_minimum_interval_in_days'] = 3
-Setting['direct_message_max_per_day'] = 3
\ No newline at end of file
+Setting['direct_message_max_per_day'] = 3
diff --git a/doc/en/dev_test_setup.md b/doc/en/dev_test_setup.md
new file mode 100644
index 000000000..d5fa28fe0
--- /dev/null
+++ b/doc/en/dev_test_setup.md
@@ -0,0 +1,11 @@
+# Configuration for development and test environments (Mac OS X)
+
+## Linux
+
+See [here](dev_test_setup_linux.md)
+
+## Mac OS X
+
+See [here](dev_test_setup_osx.md)
+
+## Windows
diff --git a/doc/en/dev_test_setup_linux.md b/doc/en/dev_test_setup_linux.md
new file mode 100644
index 000000000..df0dbb26a
--- /dev/null
+++ b/doc/en/dev_test_setup_linux.md
@@ -0,0 +1,126 @@
+# Configuration for development and test environments (GNU/Linux)
+
+## Git
+
+Git is officially maintained in Debian/Ubuntu:
+
+```
+sudo apt-get install git
+```
+
+## Ruby
+
+Ruby versions packaged in official repositories are not suitable to work with consul (at least Debian 7 and 8), so we'll have to install it manually.
+
+The preferred method is via rvm:
+
+(only the multi user option installs all dependencies automatically, as we use 'sudo'.)
+
+###as local user:
+
+```
+curl -L https://get.rvm.io | bash -s stable
+```
+###for all system users
+
+```
+curl -L https://get.rvm.io | sudo bash -s stable
+```
+
+and then add your user to rvm group
+
+```
+sudo usermod -a -G rvm <user>
+```
+
+and finally, add rvm script source to user's bash (~/.bashrc) (this step it's only necessary if you still can't execute rvm command)
+
+```
+[[ -s /usr/local/rvm/scripts/rvm ]] && source /usr/local/rvm/scripts/rvm
+```
+
+with all this, you are suppose to be able to install a ruby version from rvm, as for example version 2.3.0:
+
+```
+sudo rvm install 2.3.0
+```
+
+## Bundler
+
+with
+
+```
+gem install bundler
+```
+
+or there is more methods [here](https://rvm.io/integration/bundler) that should be better as:
+
+```
+gem install rubygems-bundler
+```
+
+## PostgreSQL (>=9.4)
+
+PostgreSQL version 9.4 is not official in debian 7 (wheezy), in 8 it seems to be officially maintained.
+
+So you have to add a repository, the official postgresql works fine.
+
+Add the repository to apt, for example creating file */etc/apt/sources.list.d/pgdg.list* with:
+
+```
+deb http://apt.postgresql.org/pub/repos/apt/ wheezy-pgdg main
+```
+
+afterwards you'll have to download the key, and install it, by:
+
+```
+wget https://www.postgresql.org/media/keys/ACCC4CF8.asc
+apt-key add ACCC4CF8.asc
+```
+
+and install postgresql
+
+```
+apt-get update
+apt-get install postgresql-9.4
+```
+
+## Ghostscript
+
+```
+apt-get install ghostscript
+```
+
+## Cloning the repository
+
+Now, with all the dependencies installed, clone the Consul repository:
+
+```
+git clone https://github.com/consul/consul.git
+cd consul
+bundle install
+cp config/database.yml.example config/database.yml
+cp config/secrets.yml.example config/secrets.yml
+```
+Perhaps it's needed to create a superuser rol with password in postgresql, and write it in */config/database.yml* 'user:' and 'password:' fields.
+
+Also, it seems that postgresql use as default an unix socket for localhost communications. If we encounter problems creating database (connection problems) we can change in */config/database.yml* the line:
+
+```
+host: localhost
+```
+
+for:
+
+```  
+host: /var/run/postgresql  
+```
+
+After this:
+
+```
+rake db:create
+rake db:setup
+rake db:dev_seed
+RAILS_ENV=test bin/rake db:setup
+```
diff --git a/doc/en/dev_test_setup_osx.md b/doc/en/dev_test_setup_osx.md
new file mode 100644
index 000000000..67845510f
--- /dev/null
+++ b/doc/en/dev_test_setup_osx.md
@@ -0,0 +1,128 @@
+# Configuration for development and test environments (Mac OS X)
+
+## Homebrew
+
+Homebrew is a very popular package manager for OS X. It's advised to use it since it makes the installation of some of the dependencies much easier.
+
+You can find the installation instructions at: [brew.sh](http://brew.sh)
+
+## XCode and XCode Command Line Tools
+
+To install *git* you'll first need to install *Xcode* (download it from the Mac App Store) and its *Xcode Command Line Tools* (you can install them from the Xcode's app menu)
+
+## Git
+
+You can download git from: [git-scm.com/download/mac](https://git-scm.com/download/mac)
+
+## Ruby y rbenv
+
+OS X already comes with a preinstalled Ruby version, but it's quite old and we need a newer one (2.3.2). One of the multiple ways of installing Ruby in OS X is through *rbenv*. The installation instructions are in its GitHub repository and are pretty straight-forward:
+
+[github.com/rbenv/rbenv](https://github.com/rbenv/rbenv)
+
+## Bundler
+
+```
+gem install bundler
+```
+
+## PostgreSQL (>=9.4)
+
+```
+brew install postgres
+```
+
+Once installed, we need to *initialize* it:
+
+```
+initdb /usr/local/var/postgres
+```
+
+Now we're going to configure some things related to the *default user*. First we start postgres server with:
+
+```
+postgres -D /usr/local/var/postgres
+```
+
+At this point we're supposed to have postgres correctly installed and a default user will automatically be created (whose name will match our username). This user hasn't got a password yet.
+
+If we run `psql` we'll login into the postgres console with the default user. Probably it will fail since its required that a default database exists for that user. We can create it by typing:
+
+```
+createdb 'your_username'
+```
+
+If we run `psql` again we should now get access to postgres console. With `\du` you can see the current users list.
+
+In case you want to set a password for your user you can make it throught postgres console by:
+
+```
+ALTER USER your_username WITH PASSWORD 'your_password';
+```
+
+Now we'll create the *consul* user, the one the application is using. Run in postgres console:
+
+```
+CREATE ROLE consul WITH PASSWORD '000';
+ALTER ROLE consul WITH SUPERUSER;
+ALTER ROLE consul WITH login;
+```
+
+If at any point during PostgreSQL installation you feel you have messed things up, you can uninstall it and start again by running:
+
+```
+brew uninstall postgres
+```
+
+You'll have to delete also this directory (otherwise the new installation will generate conflicts, source: [gist.github.com/lxneng/741932](https://gist.github.com/lxneng/741932)):
+
+```
+rm -rf /usr/local/var/postgres
+```
+
+## Postgis
+
+```
+brew install postgis
+```
+
+## Ghostscript
+
+```
+brew install ghostscript
+```
+
+## PhantomJS
+
+```
+brew install phantomjs
+```
+
+## Cloning the repository
+
+Now that we have all the dependencies installed we can download the repository:
+
+```
+git clone https://github.com/consul/consul.git
+cd consul
+bundle install
+cp config/database.yml.example config/database.yml
+cp config/secrets.yml.example config/secrets.yml
+```
+
+Now copy in `database.yml` the database user and password you used for *consul*.
+
+After this:
+
+```
+rake db:create
+rake db:setup
+rake db:dev_seed
+RAILS_ENV=test bin/rake db:setup
+```
+
+To run the tests:
+
+```
+bundle exec rspec
+```
diff --git a/doc/es/dev_test_setup.md b/doc/es/dev_test_setup.md
new file mode 100644
index 000000000..30f5d12d3
--- /dev/null
+++ b/doc/es/dev_test_setup.md
@@ -0,0 +1,9 @@
+# Configuración para los entornos de desarrollo y pruebas
+
+## Linux
+
+## Mac OS X
+
+Consultar [aquí](dev_test_setup_osx.md)
+
+## Windows
diff --git a/doc/es/dev_test_setup_osx.md b/doc/es/dev_test_setup_osx.md
new file mode 100644
index 000000000..01ad29a2b
--- /dev/null
+++ b/doc/es/dev_test_setup_osx.md
@@ -0,0 +1,128 @@
+# Configuración para los entornos de desarrollo y pruebas (Mac OS X)
+
+## Homebrew
+
+Homebrew es un gestor de paquetes para OS X muy popular. Es recomendable usarlo pues facilita enormemente la instalación de algunos de los paquetes necesarios.
+
+Puedes encontrar las instrucciones de instalación en: [brew.sh](http://brew.sh)
+
+## XCode y XCode Command Line Tools
+
+Para utilizar git necesitarás instalar *Xcode* (está en la Mac App Store) y las *Xcode Command Line Tools* (se instalan desde el menú de Xcode).
+
+## Git y Github
+
+Puedes descargar git desde: [git-scm.com/download/mac](https://git-scm.com/download/mac)
+
+## Ruby y rbenv
+
+OS X ya viene con una versión preinstalada de ruby, pero es bastante vieja y en nuestro caso no nos sirve. Una de las formas de instalar Ruby es a través de rbenv. Las instrucciones de instalación están en su GitHub y son bastante claras:
+
+[github.com/rbenv/rbenv](https://github.com/rbenv/rbenv)
+
+Después instala la versión de Ruby 2.3.2
+
+## Bundler
+
+```
+gem install bundler
+```
+
+## PostgreSQL (>=9.4)
+
+```
+brew install postgres
+```
+
+Una vez instalado es necesario *inicializar* la instalación:
+
+```
+initdb /usr/local/var/postgres
+```
+
+Ahora vamos a configurar algunos aspectos del usuario por defecto. Primero iniciamos el servidor de postgres con:
+
+```
+postgres -D /usr/local/var/postgres
+```
+
+Llegados a este punto se supone que tenemos postgres correctamente instalado y se nos habrá creado un usuario por defecto (cuyo nombre es nuestro nombre de usuario), y que (todavía) no tiene contraseña.
+
+Si ejecutamos `psql` accederemos a la consola de postgres con el usuario por defecto. Probablemente fallará porque es necesario que de antemano exista una base de datos por defecto para dicho usuario. Podemos crearla ejecutando sobre la terminal:
+
+```
+createdb 'tu_nombre_de_usuario'
+```
+
+Si ahora ejecutamos `psql` de nuevo deberíamos poder acceder correctamente a la consola de postgres. Si sobre la consola de postgres ejecutas `\du` puede ver la lista de usuarios actual.
+
+En el caso de que quieras asignarte una contraseña puedes hacerlo desde la consola de postgres con:
+
+```
+ALTER USER tu_nombre_usuario WITH PASSWORD 'tu_contraseña';
+```
+
+Ahora vamos a crear el usuario *consul*, que es el que utiliza la aplicación. Ejecuta sobre la consola de postgres:
+
+```
+CREATE ROLE consul WITH PASSWORD '000';
+ALTER ROLE consul WITH SUPERUSER;
+ALTER ROLE consul WITH login;
+```
+
+Si en algún momento durante la instalación de PostgreSQL y postgis sospechas que te has equivocado y deseas desinstalarlo y volver a empezar desde cero:
+
+```
+brew uninstall postgres
+```
+
+También tendrás que borrar el siguiente directorio para que no de conflictos cuando intentes volver a instalarlo (fuente: [gist.github.com/lxneng/741932](https://gist.github.com/lxneng/741932)):
+
+```
+rm -rf /usr/local/var/postgres
+```
+
+## Postgis
+
+```
+brew install postgis
+```
+
+## Ghostscript
+
+```
+brew install ghostscript
+```
+
+## PhantomJS
+
+```
+brew install phantomjs
+```
+
+## Clonar el repositorio
+
+Ahora que ya tenemos todas las dependencias instalado podemos bajarnos el proyecto:
+
+```
+git clone https://github.com/consul/consul.git
+cd consul
+bundle install
+cp config/database.yml.example config/database.yml
+cp config/secrets.yml.example config/secrets.yml
+```
+
+Ahora copia en `database.yml` el usuario y la contraseña que pusiste para *consul*. Cuando ya lo hayas hecho:
+
+```
+rake db:create
+rake db:setup
+rake db:dev_seed
+RAILS_ENV=test bin/rake db:setup
+```
+
+Para ejecutar los tests:
+
+```
+bundle exec rspec
+```
diff --git a/knapsack_rspec_report.json b/knapsack_rspec_report.json
new file mode 100644
index 000000000..f31245481
--- /dev/null
+++ b/knapsack_rspec_report.json
@@ -0,0 +1,132 @@
+{
+  "spec/features/admin/debates_spec.rb": 3.196030855178833,
+  "spec/lib/manager_authenticator_spec.rb": 0.7661557197570801,
+  "spec/helpers/geozones_helper_spec.rb": 0.3235890865325928,
+  "spec/features/valuation_spec.rb": 1.5787968635559082,
+  "spec/features/comments/proposals_spec.rb": 16.83220624923706,
+  "spec/helpers/verification_helper_spec.rb": 0.2460770606994629,
+  "spec/features/verification/level_three_verification_spec.rb": 2.016052007675171,
+  "spec/features/stats_spec.rb": 1.1409127712249756,
+  "spec/controllers/concerns/has_filters_spec.rb": 0.4043538570404053,
+  "spec/models/organization_spec.rb": 1.1652114391326904,
+  "spec/features/admin/users_spec.rb": 1.5635802745819092,
+  "spec/features/admin/proposals_spec.rb": 2.2328972816467285,
+  "spec/features/ckeditor_spec.rb": 0.7215390205383301,
+  "spec/features/users_auth_spec.rb": 5.428045988082886,
+  "spec/lib/wysiwyg_sanitizer_spec.rb": 0.31694674491882324,
+  "spec/helpers/orders_helper_spec.rb": 0.22522211074829102,
+  "spec/features/admin_spec.rb": 1.694303035736084,
+  "spec/features/admin/comments_spec.rb": 2.8705501556396484,
+  "spec/lib/tag_sanitizer_spec.rb": 0.3478989601135254,
+  "spec/features/votes_spec.rb": 13.293350458145142,
+  "spec/helpers/application_helper_spec.rb": 0.47275686264038086,
+  "spec/features/management/spending_proposals_spec.rb": 4.437402725219727,
+  "spec/features/users_spec.rb": 6.648370027542114,
+  "spec/models/abilities/moderator_spec.rb": 7.65787410736084,
+  "spec/features/welcome_spec.rb": 1.5993311405181885,
+  "spec/features/management/email_verifications_spec.rb": 0.3190898895263672,
+  "spec/features/localization_spec.rb": 0.8935031890869141,
+  "spec/mailers/mailer_spec.rb": 0.1826329231262207,
+  "spec/models/valuator_spec.rb": 0.2230076789855957,
+  "spec/features/organizations_spec.rb": 0.7282412052154541,
+  "spec/features/moderation/debates_spec.rb": 5.6599204540252686,
+  "spec/models/verification/management/email_spec.rb": 0.8871691226959229,
+  "spec/helpers/votes_helper_spec.rb": 0.8153252601623535,
+  "spec/lib/census_api_spec.rb": 0.8195827007293701,
+  "spec/lib/cache_spec.rb": 0.16429710388183594,
+  "spec/features/management/document_verifications_spec.rb": 1.4376773834228516,
+  "spec/controllers/management/base_controller_spec.rb": 0.3214681148529053,
+  "spec/features/management/account_spec.rb": 1.284877061843872,
+  "spec/features/tags_spec.rb": 5.2347259521484375,
+  "spec/features/management/users_spec.rb": 2.2339844703674316,
+  "spec/models/abilities/administrator_spec.rb": 4.104190111160278,
+  "spec/features/proposal_ballots_spec.rb": 1.0345211029052734,
+  "spec/models/abilities/organization_spec.rb": 1.2938573360443115,
+  "spec/features/spending_proposals_spec.rb": 3.00465989112854,
+  "spec/features/direct_messages_spec.rb": 1.7699065208435059,
+  "spec/features/proposal_notifications_spec.rb": 3.206688642501831,
+  "spec/features/admin/feature_flags_spec.rb": 0.7250113487243652,
+  "spec/features/valuation/spending_proposals_spec.rb": 9.08467411994934,
+  "spec/controllers/management/users_controller_spec.rb": 0.14328908920288086,
+  "spec/features/debates_spec.rb": 32.769495487213135,
+  "spec/lib/acts_as_paranoid_aliases_spec.rb": 0.672633171081543,
+  "spec/lib/acts_as_taggable_on_spec.rb": 0.4580230712890625,
+  "spec/models/proposal_notification_spec.rb": 0.8798811435699463,
+  "spec/models/abilities/everyone_spec.rb": 1.4743411540985107,
+  "spec/controllers/debates_controller_spec.rb": 0.597097635269165,
+  "spec/features/official_positions_spec.rb": 1.7662339210510254,
+  "spec/features/verification/verification_path_spec.rb": 1.8311583995819092,
+  "spec/models/notification_spec.rb": 1.6735141277313232,
+  "spec/features/tracks_spec.rb": 2.7991549968719482,
+  "spec/features/management/proposals_spec.rb": 4.453279733657837,
+  "spec/models/custom/residence_spec.rb": 0.26375889778137207,
+  "spec/features/admin/stats_spec.rb": 3.427401304244995,
+  "spec/controllers/management/sessions_controller_spec.rb": 0.6672155857086182,
+  "spec/features/comments/debates_spec.rb": 17.62152862548828,
+  "spec/features/admin/activity_spec.rb": 8.008464813232422,
+  "spec/models/residence_spec.rb": 1.7478408813476562,
+  "spec/features/moderation/comments_spec.rb": 6.95853328704834,
+  "spec/models/flag_spec.rb": 1.2313306331634521,
+  "spec/models/geozone_spec.rb": 0.21416401863098145,
+  "spec/models/debate_spec.rb": 13.919430494308472,
+  "spec/mailers/devise_mailer_spec.rb": 0.3003346920013428,
+  "spec/features/moderation/users_spec.rb": 1.304518222808838,
+  "spec/features/verification/residence_spec.rb": 2.4076998233795166,
+  "spec/features/admin/banners_spec.rb": 3.2043681144714355,
+  "spec/models/user_spec.rb": 8.115702629089355,
+  "spec/helpers/users_helper_spec.rb": 0.6146798133850098,
+  "spec/models/lock_spec.rb": 0.5752274990081787,
+  "spec/features/admin/officials_spec.rb": 1.1229417324066162,
+  "spec/features/legislation_spec.rb": 2.646373987197876,
+  "spec/features/management/localization_spec.rb": 1.276548147201538,
+  "spec/models/abilities/common_spec.rb": 8.870994567871094,
+  "spec/controllers/concerns/has_orders_spec.rb": 0.5060961246490479,
+  "spec/models/verification/management/document_spec.rb": 0.55743408203125,
+  "spec/models/letter_spec.rb": 0.73256516456604,
+  "spec/features/moderation/proposals_spec.rb": 5.034556865692139,
+  "spec/features/emails_spec.rb": 9.274869441986084,
+  "spec/features/verification/verified_user_spec.rb": 1.4910340309143066,
+  "spec/helpers/proposals_helper_spec.rb": 1.1765329837799072,
+  "spec/controllers/pages_controller_spec.rb": 1.35672926902771,
+  "spec/i18n_spec.rb": 27.789604902267456,
+  "spec/features/verification/sms_spec.rb": 1.5330836772918701,
+  "spec/lib/email_digests_spec.rb": 1.1210927963256836,
+  "spec/features/proposals_spec.rb": 43.270474910736084,
+  "spec/features/verification/level_two_verification_spec.rb": 0.5128798484802246,
+  "spec/models/comment_spec.rb": 2.6471173763275146,
+  "spec/models/identity_spec.rb": 0.08924984931945801,
+  "spec/models/vote_spec.rb": 0.6714668273925781,
+  "spec/models/spending_proposal_spec.rb": 6.144777774810791,
+  "spec/features/sessions_spec.rb": 0.6140999794006348,
+  "spec/features/registration_form_spec.rb": 1.3086371421813965,
+  "spec/features/admin/tags_spec.rb": 1.2578890323638916,
+  "spec/customization_engine_spec.rb": 0.9755609035491943,
+  "spec/features/admin/organizations_spec.rb": 4.552514553070068,
+  "spec/models/proposal_spec.rb": 14.755258560180664,
+  "spec/features/moderation_spec.rb": 1.702514410018921,
+  "spec/helpers/settings_helper_spec.rb": 0.22182989120483398,
+  "spec/models/tag_cloud_spec.rb": 2.6144700050354004,
+  "spec/features/user_invites_spec.rb": 0.22390198707580566,
+  "spec/models/activity_spec.rb": 1.5089714527130127,
+  "spec/controllers/admin/api/stats_controller_spec.rb": 0.6779742240905762,
+  "spec/features/management/managed_users_spec.rb": 1.556541919708252,
+  "spec/models/direct_message_spec.rb": 1.4555466175079346,
+  "spec/features/admin/spending_proposals_spec.rb": 16.1976478099823,
+  "spec/controllers/users/registrations_controller_spec.rb": 0.24361419677734375,
+  "spec/features/admin/moderators_spec.rb": 1.3666069507598877,
+  "spec/models/sms_spec.rb": 0.352916955947876,
+  "spec/models/setting_spec.rb": 1.2480311393737793,
+  "spec/features/verification/email_spec.rb": 0.6614222526550293,
+  "spec/features/admin/valuators_spec.rb": 0.9944217205047607,
+  "spec/models/ahoy/data_source_spec.rb": 0.4324939250946045,
+  "spec/features/account_spec.rb": 2.387765407562256,
+  "spec/features/notifications_spec.rb": 10.897897958755493,
+  "spec/features/campaigns_spec.rb": 1.1797480583190918,
+  "spec/features/home_spec.rb": 1.0699732303619385,
+  "spec/features/admin/verifications_spec.rb": 1.4650330543518066,
+  "spec/features/admin/managers_spec.rb": 1.3956513404846191,
+  "spec/models/abilities/valuator_spec.rb": 0.40586066246032715,
+  "spec/helpers/comments_helper_spec.rb": 0.7347445487976074,
+  "spec/features/admin/settings_spec.rb": 0.522209644317627,
+  "spec/features/verification/letter_spec.rb": 2.5052530765533447
+}
\ No newline at end of file
diff --git a/lib/acts_as_paranoid_aliases.rb b/lib/acts_as_paranoid_aliases.rb
index 7f2cfe4bd..4f69ee65a 100644
--- a/lib/acts_as_paranoid_aliases.rb
+++ b/lib/acts_as_paranoid_aliases.rb
@@ -5,7 +5,7 @@ module ActsAsParanoidAliases
 
     def hide
       return false if hidden?
-      update_attribute(:hidden_at, Time.now)
+      update_attribute(:hidden_at, Time.current)
       after_hide
     end
 
@@ -21,7 +21,7 @@ module ActsAsParanoidAliases
     end
 
     def confirm_hide
-      update_attribute(:confirmed_hide_at, Time.now)
+      update_attribute(:confirmed_hide_at, Time.current)
     end
 
     def restore(opts={})
diff --git a/lib/email_digest.rb b/lib/email_digest.rb
index 209014dcc..2936a5db5 100644
--- a/lib/email_digest.rb
+++ b/lib/email_digest.rb
@@ -21,7 +21,7 @@ class EmailDigest
   end
 
   def mark_as_emailed
-    notifications.update_all(emailed_at: Time.now)
+    notifications.update_all(emailed_at: Time.current)
   end
 
-end
\ No newline at end of file
+end
diff --git a/lib/score_calculator.rb b/lib/score_calculator.rb
index 70d3835ec..32086392a 100644
--- a/lib/score_calculator.rb
+++ b/lib/score_calculator.rb
@@ -11,7 +11,7 @@ module ScoreCalculator
     score   = ups - downs
     offset  = Math.log([score.abs, 1].max, 10) * (ups / [total, 1].max)
     sign    = score <=> 0
-    seconds = ((date || Time.now) - EPOC).to_f
+    seconds = ((date || Time.current) - EPOC).to_f
 
     (((offset * sign) + (seconds/TIME_UNIT)) * 10000000).round
   end
diff --git a/lib/tasks/comments.rake b/lib/tasks/comments.rake
index 5b4f73278..67ca1ab7d 100644
--- a/lib/tasks/comments.rake
+++ b/lib/tasks/comments.rake
@@ -13,4 +13,4 @@ namespace :comments do
     end
   end
 
-end
+end
\ No newline at end of file
diff --git a/lib/tasks/proposals.rake b/lib/tasks/proposals.rake
index ddba8f913..447876cc2 100644
--- a/lib/tasks/proposals.rake
+++ b/lib/tasks/proposals.rake
@@ -1,4 +1,5 @@
 namespace :proposals do
+
   desc "Updates all proposals by recalculating their hot_score"
   task touch: :environment do
     Proposal.find_in_batches do |proposals|
@@ -6,4 +7,4 @@ namespace :proposals do
     end
   end
 
-end
+end
\ No newline at end of file
diff --git a/lib/tasks/spending_proposals.rake b/lib/tasks/spending_proposals.rake
index 365338d96..6e11b13e7 100644
--- a/lib/tasks/spending_proposals.rake
+++ b/lib/tasks/spending_proposals.rake
@@ -1,4 +1,5 @@
 namespace :spending_proposals do
+
   desc "Sends an email to the authors of unfeasible spending proposals"
   task send_unfeasible_emails: :environment do
     SpendingProposal.find_each do |spending_proposal|
@@ -18,4 +19,4 @@ namespace :spending_proposals do
     end
   end
 
-end
+end
\ No newline at end of file
diff --git a/lib/tasks/users.rake b/lib/tasks/users.rake
index efbeeaa94..a45d7fb34 100644
--- a/lib/tasks/users.rake
+++ b/lib/tasks/users.rake
@@ -76,4 +76,12 @@ namespace :users do
   task remove_erased_identities: :environment do
     Identity.joins(:user).where('users.erased_at IS NOT NULL').destroy_all
   end
-end
+
+  desc "Update password changed at for existing users"
+  task update_password_changed_at: :environment do
+    User.all.each do |user|
+      user.update(password_changed_at: user.created_at)
+    end
+  end
+
+end
\ No newline at end of file
diff --git a/public/404.html b/public/404.html
index 5d519fb70..cc6820bba 100644
--- a/public/404.html
+++ b/public/404.html
@@ -5,7 +5,7 @@
   <meta name="viewport" content="width=device-width,initial-scale=1">
   <style>
   body {
-    background: #065687 url('errors_bg.jpg');
+    background: #065687 url('/errors_bg.jpg');
     color: #2E2F30;
     font-family: arial, sans-serif;
     margin: 0;
diff --git a/public/422.html b/public/422.html
index b57d0d01e..e68d2956f 100644
--- a/public/422.html
+++ b/public/422.html
@@ -5,7 +5,7 @@
   <meta name="viewport" content="width=device-width,initial-scale=1">
   <style>
   body {
-    background: #065687 url('errors_bg.jpg');
+    background: #065687 url('/errors_bg.jpg');
     color: #2E2F30;
     font-family: arial, sans-serif;
     margin: 0;
diff --git a/public/500.html b/public/500.html
index d47e8821c..71978cdce 100644
--- a/public/500.html
+++ b/public/500.html
@@ -5,7 +5,7 @@
   <meta name="viewport" content="width=device-width,initial-scale=1">
   <style>
   body {
-    background: #065687 url('errors_bg.jpg');
+    background: #065687 url('/errors_bg.jpg');
     color: #2E2F30;
     font-family: arial, sans-serif;
     margin: 0;
diff --git a/spec/customization_engine_spec.rb b/spec/customization_engine_spec.rb
new file mode 100644
index 000000000..a18130543
--- /dev/null
+++ b/spec/customization_engine_spec.rb
@@ -0,0 +1,29 @@
+require 'rails_helper'
+
+# This module tests functionality related with custom application files
+# TODO test models, controllers, etc...
+
+describe 'CustomizationEngine' do
+
+  let(:test_key) { I18n.t('account.show.change_credentials_link') }
+  let!(:default_path) { I18n.load_path }
+
+  it "should load custom and override original locales" do
+    I18n.load_path += Dir[Rails.root.join('spec', 'support', 'locales', 'custom', '*.{rb,yml}')]
+    I18n.reload!
+    expect(test_key).to eq 'Overriden string with custom locales'
+  end
+
+  it "should not override original locales" do
+    I18n.load_path.delete_if {|item| item =~ /spec\/support\/locales\/custom/ }
+    I18n.load_path += Dir[Rails.root.join('spec', 'support', 'locales', '**', '*.{rb,yml}')]
+    I18n.reload!
+    expect(test_key).to eq 'Not overriden string with custom locales'
+  end
+
+  after(:each) do
+    I18n.load_path = default_path
+    I18n.reload!
+  end
+
+end
diff --git a/spec/factories.rb b/spec/factories.rb
index 243e3a928..b5e800d65 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -7,7 +7,7 @@ FactoryGirl.define do
 
     password            'judgmentday'
     terms_of_service     '1'
-    confirmed_at        { Time.now }
+    confirmed_at        { Time.current }
 
     trait :incomplete_verification do
       after :create do |user|
@@ -16,7 +16,7 @@ FactoryGirl.define do
     end
 
     trait :level_two do
-      residence_verified_at Time.now
+      residence_verified_at Time.current
       unconfirmed_phone "611111111"
       confirmed_phone "611111111"
       sms_confirmation_code "1234"
@@ -25,17 +25,17 @@ FactoryGirl.define do
     end
 
     trait :level_three do
-      verified_at Time.now
+      verified_at Time.current
       document_type "1"
       document_number
     end
 
     trait :hidden do
-      hidden_at Time.now
+      hidden_at Time.current
     end
 
     trait :with_confirmed_hide do
-      confirmed_hide_at Time.now
+      confirmed_hide_at Time.current
     end
   end
 
@@ -86,7 +86,7 @@ FactoryGirl.define do
   factory :lock do
     user
     tries 0
-    locked_until Time.now
+    locked_until Time.current
   end
 
   factory :verified_user do
@@ -101,15 +101,15 @@ FactoryGirl.define do
     association :author, factory: :user
 
     trait :hidden do
-      hidden_at Time.now
+      hidden_at Time.current
     end
 
     trait :with_ignored_flag do
-      ignored_flag_at Time.now
+      ignored_flag_at Time.current
     end
 
     trait :with_confirmed_hide do
-      confirmed_hide_at Time.now
+      confirmed_hide_at Time.current
     end
 
     trait :flagged do
@@ -146,15 +146,15 @@ FactoryGirl.define do
     association :author, factory: :user
 
     trait :hidden do
-      hidden_at Time.now
+      hidden_at Time.current
     end
 
     trait :with_ignored_flag do
-      ignored_flag_at Time.now
+      ignored_flag_at Time.current
     end
 
     trait :with_confirmed_hide do
-      confirmed_hide_at Time.now
+      confirmed_hide_at Time.current
     end
 
     trait :flagged do
@@ -163,6 +163,10 @@ FactoryGirl.define do
       end
     end
 
+    trait :archived do
+      created_at 25.months.ago
+    end
+
     trait :with_hot_score do
       before(:save) { |d| d.calculate_hot_score }
     end
@@ -284,15 +288,15 @@ FactoryGirl.define do
     sequence(:body) { |n| "Comment body #{n}" }
 
     trait :hidden do
-      hidden_at Time.now
+      hidden_at Time.current
     end
 
     trait :with_ignored_flag do
-      ignored_flag_at Time.now
+      ignored_flag_at Time.current
     end
 
     trait :with_confirmed_hide do
-      confirmed_hide_at Time.now
+      confirmed_hide_at Time.current
     end
 
     trait :flagged do
@@ -341,11 +345,11 @@ FactoryGirl.define do
     sequence(:name) { |n| "org#{n}" }
 
     trait :verified do
-      verified_at Time.now
+      verified_at Time.current
     end
 
     trait :rejected do
-      rejected_at Time.now
+      rejected_at Time.current
     end
   end
 
@@ -368,13 +372,13 @@ FactoryGirl.define do
 
   factory :ahoy_event, :class => Ahoy::Event do
     id { SecureRandom.uuid }
-    time DateTime.now
+    time DateTime.current
     sequence(:name) {|n| "Event #{n} type"}
   end
 
   factory :visit  do
     id { SecureRandom.uuid }
-    started_at DateTime.now
+    started_at DateTime.current
   end
 
   factory :campaign do
@@ -398,8 +402,8 @@ FactoryGirl.define do
     style {["banner-style-one", "banner-style-two", "banner-style-three"].sample}
     image {["banner.banner-img-one", "banner.banner-img-two", "banner.banner-img-three"].sample}
     target_url {["/proposals", "/debates" ].sample}
-    post_started_at Time.now - 7.days
-    post_ended_at Time.now + 7.days
+    post_started_at Time.current - 7.days
+    post_ended_at Time.current + 7.days
   end
 
   factory :proposal_notification do
diff --git a/spec/features/admin/banners_spec.rb b/spec/features/admin/banners_spec.rb
index 8578778ed..72814b3c3 100644
--- a/spec/features/admin/banners_spec.rb
+++ b/spec/features/admin/banners_spec.rb
@@ -1,6 +1,7 @@
 require 'rails_helper'
 
 feature 'Admin banners magement' do
+
   background do
     login_as(create(:administrator).user)
   end
@@ -12,40 +13,40 @@ feature 'Admin banners magement' do
                   target_url:  "http://www.url.com",
                   style: "banner-style.banner-one",
                   image: "banner-img.banner-one",
-                  post_started_at: (Time.now + 4.days),
-                  post_ended_at:   (Time.now + 10.days))
+                  post_started_at: (Time.current + 4.days),
+                  post_ended_at:   (Time.current + 10.days))
 
       @banner2 = create(:banner, title: "Banner number two",
                   description:  "This is the text of banner number two and is not longer active",
                   target_url:  "http://www.url.com",
                   style: "banner-style.banner-two",
                   image: "banner-img.banner-two",
-                  post_started_at: (Time.now - 10.days),
-                  post_ended_at:   (Time.now - 3.days))
+                  post_started_at: (Time.current - 10.days),
+                  post_ended_at:   (Time.current - 3.days))
 
       @banner3 = create(:banner, title: "Banner number three",
                   description:  "This is the text of banner number three and has style banner-three",
                   target_url:  "http://www.url.com",
                   style: "banner-style.banner-three",
                   image: "banner-img.banner-three",
-                  post_started_at: (Time.now - 1.days),
-                  post_ended_at:   (Time.now + 10.days))
+                  post_started_at: (Time.current - 1.days),
+                  post_ended_at:   (Time.current + 10.days))
 
       @banner4 = create(:banner, title: "Banner number four",
                   description:  "This is the text of banner number four and has style banner-one",
                   target_url:  "http://www.url.com",
                   style: "banner-style.banner-one",
                   image: "banner-img.banner-one",
-                  post_started_at: (DateTime.now - 10.days),
-                  post_ended_at:   (DateTime.now + 10.days))
+                  post_started_at: (DateTime.current - 10.days),
+                  post_ended_at:   (DateTime.current + 10.days))
 
       @banner5 = create(:banner, title: "Banner number five",
                   description:  "This is the text of banner number five and has style banner-two",
                   target_url:  "http://www.url.com",
                   style: "banner-style.banner-one",
                   image: "banner-img.banner-one",
-                  post_started_at: (DateTime.now - 10.days),
-                  post_ended_at:   (DateTime.now + 10.days))
+                  post_started_at: (DateTime.current - 10.days),
+                  post_ended_at:   (DateTime.current + 10.days))
     end
 
     scenario 'Index show active banners' do
@@ -86,8 +87,8 @@ feature 'Admin banners magement' do
     fill_in 'banner_title', with: 'Such banner'
     fill_in 'banner_description', with: 'many text wow link'
     fill_in 'banner_target_url', with: 'https://www.url.com'
-    last_week = Time.now - 7.days
-    next_week = Time.now + 7.days
+    last_week = Time.current - 7.days
+    next_week = Time.current + 7.days
     fill_in 'post_started_at', with: last_week.strftime("%d/%m/%Y")
     fill_in 'post_ended_at', with: next_week.strftime("%d/%m/%Y")
 
@@ -107,8 +108,8 @@ feature 'Admin banners magement' do
                               target_url:  'http://www.url.com',
                               style: 'banner-style.banner-one',
                               image: 'banner-img.banner-one',
-                              post_started_at: (Time.now + 4.days),
-                              post_ended_at:   (Time.now + 10.days))
+                              post_started_at: (Time.current + 4.days),
+                              post_ended_at:   (Time.current + 10.days))
 
     visit admin_root_path
 
@@ -124,8 +125,8 @@ feature 'Admin banners magement' do
     fill_in 'banner_description', with: 'Edited text'
 
     within('div#js-banner-style') do
-      expect(page).to have_selector('h2', :text => 'Modified title')
-      expect(page).to have_selector('h3', :text => 'Edited text')
+      expect(page).to have_selector('h2', text: 'Modified title')
+      expect(page).to have_selector('h3', text: 'Edited text')
     end
 
     click_button 'Save changes'
@@ -139,13 +140,14 @@ feature 'Admin banners magement' do
   end
 
   scenario 'Delete a banner' do
-    banner1 = create(:banner, title: 'Ugly banner',
-                              description: 'Bad text',
-                              target_url:  'http://www.url.com',
-                              style: 'banner-style.banner-one',
-                              image: 'banner-img.banner-one',
-                              post_started_at: (Time.now + 4.days),
-                              post_ended_at:   (Time.now + 10.days))
+    create(:banner, title: 'Ugly banner',
+                    description: 'Bad text',
+                    target_url:  'http://www.url.com',
+                    style: 'banner-style.banner-one',
+                    image: 'banner-img.banner-one',
+                    post_started_at: (Time.current + 4.days),
+                    post_ended_at:   (Time.current + 10.days))
+
     visit admin_root_path
 
     within("#side_menu") do
@@ -160,4 +162,4 @@ feature 'Admin banners magement' do
     expect(page).to_not have_content 'Ugly banner'
   end
 
-end
\ No newline at end of file
+end
diff --git a/spec/features/admin/comments_spec.rb b/spec/features/admin/comments_spec.rb
index 34768596f..3de3395d0 100644
--- a/spec/features/admin/comments_spec.rb
+++ b/spec/features/admin/comments_spec.rb
@@ -98,4 +98,4 @@ feature 'Admin comments' do
     expect(current_url).to include('page=2')
   end
 
-end
+end
\ No newline at end of file
diff --git a/spec/features/admin/debates_spec.rb b/spec/features/admin/debates_spec.rb
index 43d12b081..c74825db7 100644
--- a/spec/features/admin/debates_spec.rb
+++ b/spec/features/admin/debates_spec.rb
@@ -91,4 +91,4 @@ feature 'Admin debates' do
     expect(current_url).to include('page=2')
   end
 
-end
+end
\ No newline at end of file
diff --git a/spec/features/admin/feature_flags_spec.rb b/spec/features/admin/feature_flags_spec.rb
index 55ea30837..4cb99a401 100644
--- a/spec/features/admin/feature_flags_spec.rb
+++ b/spec/features/admin/feature_flags_spec.rb
@@ -60,4 +60,5 @@ feature 'Admin feature flags' do
       expect(page).to have_link "Spending proposals"
     end
   end
+
 end
\ No newline at end of file
diff --git a/spec/features/admin/managers_spec.rb b/spec/features/admin/managers_spec.rb
index 100781446..54b8cc77a 100644
--- a/spec/features/admin/managers_spec.rb
+++ b/spec/features/admin/managers_spec.rb
@@ -33,5 +33,5 @@ feature 'Admin managers' do
       expect(page).to_not have_content @manager.name
     end
   end
-end
 
+end
\ No newline at end of file
diff --git a/spec/features/admin/settings_spec.rb b/spec/features/admin/settings_spec.rb
index 3673ccd4f..c92b4b525 100644
--- a/spec/features/admin/settings_spec.rb
+++ b/spec/features/admin/settings_spec.rb
@@ -27,4 +27,5 @@ feature 'Admin settings' do
 
     expect(page).to have_content 'Value updated'
   end
+
 end
\ No newline at end of file
diff --git a/spec/features/admin/spending_proposals_spec.rb b/spec/features/admin/spending_proposals_spec.rb
index fe1b87fc3..73b157fd9 100644
--- a/spec/features/admin/spending_proposals_spec.rb
+++ b/spec/features/admin/spending_proposals_spec.rb
@@ -665,4 +665,4 @@ feature 'Admin spending proposals' do
 
   end
 
-end
+end
\ No newline at end of file
diff --git a/spec/features/admin/verifications_spec.rb b/spec/features/admin/verifications_spec.rb
index 9ecd39314..50ff457a1 100644
--- a/spec/features/admin/verifications_spec.rb
+++ b/spec/features/admin/verifications_spec.rb
@@ -51,7 +51,7 @@ feature 'Incomplete verifications' do
   end
 
   scenario "Phone not given" do
-    incompletely_verified_user = create(:user, residence_verified_at: Time.now, unconfirmed_phone: nil)
+    incompletely_verified_user = create(:user, residence_verified_at: Time.current, unconfirmed_phone: nil)
 
     visit admin_verifications_path
 
@@ -61,7 +61,7 @@ feature 'Incomplete verifications' do
   end
 
   scenario "SMS code not confirmed" do
-    incompletely_verified_user = create(:user, residence_verified_at: Time.now,
+    incompletely_verified_user = create(:user, residence_verified_at: Time.current,
                                                unconfirmed_phone:     "611111111",
                                                sms_confirmation_code: "1234",
                                                confirmed_phone:       nil)
diff --git a/spec/features/comments/debates_spec.rb b/spec/features/comments/debates_spec.rb
index d9e58343a..577ba6fd0 100644
--- a/spec/features/comments/debates_spec.rb
+++ b/spec/features/comments/debates_spec.rb
@@ -62,9 +62,9 @@ feature 'Commenting debates' do
   end
 
   scenario 'Comment order' do
-    c1 = create(:comment, :with_confidence_score, commentable: debate, cached_votes_up: 100, cached_votes_total: 120, created_at: Time.now - 2)
-    c2 = create(:comment, :with_confidence_score, commentable: debate, cached_votes_up: 10, cached_votes_total: 12, created_at: Time.now - 1)
-    c3 = create(:comment, :with_confidence_score, commentable: debate, cached_votes_up: 1, cached_votes_total: 2, created_at: Time.now)
+    c1 = create(:comment, :with_confidence_score, commentable: debate, cached_votes_up: 100, cached_votes_total: 120, created_at: Time.current - 2)
+    c2 = create(:comment, :with_confidence_score, commentable: debate, cached_votes_up: 10, cached_votes_total: 12, created_at: Time.current - 1)
+    c3 = create(:comment, :with_confidence_score, commentable: debate, cached_votes_up: 1, cached_votes_total: 2, created_at: Time.current)
 
     visit debate_path(debate, order: :most_voted)
 
@@ -83,10 +83,10 @@ feature 'Commenting debates' do
   end
 
   scenario 'Creation date works differently in roots and in child comments, even when sorting by confidence_score' do
-    old_root = create(:comment, commentable: debate, created_at: Time.now - 10)
-    new_root = create(:comment, commentable: debate, created_at: Time.now)
-    old_child = create(:comment, commentable: debate, parent_id: new_root.id, created_at: Time.now - 10)
-    new_child = create(:comment, commentable: debate, parent_id: new_root.id, created_at: Time.now)
+    old_root = create(:comment, commentable: debate, created_at: Time.current - 10)
+    new_root = create(:comment, commentable: debate, created_at: Time.current)
+    old_child = create(:comment, commentable: debate, parent_id: new_root.id, created_at: Time.current - 10)
+    new_child = create(:comment, commentable: debate, parent_id: new_root.id, created_at: Time.current)
 
     visit debate_path(debate, order: :most_voted)
 
@@ -418,7 +418,7 @@ feature 'Commenting debates' do
 
   feature 'Voting comments' do
     background do
-      @manuela = create(:user, verified_at: Time.now)
+      @manuela = create(:user, verified_at: Time.current)
       @pablo = create(:user)
       @debate = create(:debate)
       @comment = create(:comment, commentable: @debate)
diff --git a/spec/features/comments/proposals_spec.rb b/spec/features/comments/proposals_spec.rb
index a861615b7..9f3d22966 100644
--- a/spec/features/comments/proposals_spec.rb
+++ b/spec/features/comments/proposals_spec.rb
@@ -62,9 +62,9 @@ feature 'Commenting proposals' do
   end
 
   scenario 'Comment order' do
-    c1 = create(:comment, :with_confidence_score, commentable: proposal, cached_votes_up: 100, cached_votes_total: 120, created_at: Time.now - 2)
-    c2 = create(:comment, :with_confidence_score, commentable: proposal, cached_votes_up: 10, cached_votes_total: 12, created_at: Time.now - 1)
-    c3 = create(:comment, :with_confidence_score, commentable: proposal, cached_votes_up: 1, cached_votes_total: 2, created_at: Time.now)
+    c1 = create(:comment, :with_confidence_score, commentable: proposal, cached_votes_up: 100, cached_votes_total: 120, created_at: Time.current - 2)
+    c2 = create(:comment, :with_confidence_score, commentable: proposal, cached_votes_up: 10, cached_votes_total: 12, created_at: Time.current - 1)
+    c3 = create(:comment, :with_confidence_score, commentable: proposal, cached_votes_up: 1, cached_votes_total: 2, created_at: Time.current)
 
     visit proposal_path(proposal, order: :most_voted)
 
@@ -83,10 +83,10 @@ feature 'Commenting proposals' do
   end
 
   scenario 'Creation date works differently in roots and in child comments, when sorting by confidence_score' do
-   old_root = create(:comment, commentable: proposal, created_at: Time.now - 10)
-   new_root = create(:comment, commentable: proposal, created_at: Time.now)
-   old_child = create(:comment, commentable: proposal, parent_id: new_root.id, created_at: Time.now - 10)
-   new_child = create(:comment, commentable: proposal, parent_id: new_root.id, created_at: Time.now)
+   old_root = create(:comment, commentable: proposal, created_at: Time.current - 10)
+   new_root = create(:comment, commentable: proposal, created_at: Time.current)
+   old_child = create(:comment, commentable: proposal, parent_id: new_root.id, created_at: Time.current - 10)
+   new_child = create(:comment, commentable: proposal, parent_id: new_root.id, created_at: Time.current)
 
    visit proposal_path(proposal, order: :most_voted)
 
@@ -407,7 +407,7 @@ feature 'Commenting proposals' do
   feature 'Voting comments' do
 
     background do
-      @manuela = create(:user, verified_at: Time.now)
+      @manuela = create(:user, verified_at: Time.current)
       @pablo = create(:user)
       @proposal = create(:proposal)
       @comment = create(:comment, commentable: @proposal)
diff --git a/spec/features/debates_spec.rb b/spec/features/debates_spec.rb
index d20c1c302..b60d8aa59 100644
--- a/spec/features/debates_spec.rb
+++ b/spec/features/debates_spec.rb
@@ -422,9 +422,9 @@ feature 'Debates' do
     end
 
     scenario 'Debates are ordered by newest', :js do
-      create(:debate, title: 'Best',   created_at: Time.now)
-      create(:debate, title: 'Medium', created_at: Time.now - 1.hour)
-      create(:debate, title: 'Worst',  created_at: Time.now - 1.day)
+      create(:debate, title: 'Best',   created_at: Time.current)
+      create(:debate, title: 'Medium', created_at: Time.current - 1.hour)
+      create(:debate, title: 'Worst',  created_at: Time.current - 1.day)
 
       visit debates_path
       click_link 'newest'
@@ -808,7 +808,7 @@ feature 'Debates' do
     scenario "Reorder results maintaing search", :js do
       debate1 = create(:debate, title: "Show you got",      cached_votes_up: 10,  created_at: 1.week.ago)
       debate2 = create(:debate, title: "Show what you got", cached_votes_up: 1,   created_at: 1.month.ago)
-      debate3 = create(:debate, title: "Show you got",      cached_votes_up: 100, created_at: Time.now)
+      debate3 = create(:debate, title: "Show you got",      cached_votes_up: 100, created_at: Time.current)
       debate4 = create(:debate, title: "Do not display",    cached_votes_up: 1,   created_at: 1.week.ago)
 
       visit debates_path
@@ -956,7 +956,6 @@ feature 'Debates' do
     end
   end
 
-
   context 'Suggesting debates' do
     scenario 'Shows up to 5 suggestions', :js do
       author = create(:user)
@@ -1029,12 +1028,11 @@ feature 'Debates' do
     end
   end
 
-
   scenario 'Index include featured debates' do
     admin = create(:administrator)
     login_as(admin.user)
 
-    debate1 = create(:debate, featured_at: Time.now)
+    debate1 = create(:debate, featured_at: Time.current)
     debate2 = create(:debate)
 
     visit debates_path
diff --git a/spec/features/moderation/comments_spec.rb b/spec/features/moderation/comments_spec.rb
index faffef79b..dc3604c3a 100644
--- a/spec/features/moderation/comments_spec.rb
+++ b/spec/features/moderation/comments_spec.rb
@@ -170,9 +170,9 @@ feature 'Moderate comments' do
     end
 
     scenario "sorting comments" do
-      create(:comment, body: "Flagged comment", created_at: Time.now - 1.day, flags_count: 5)
-      create(:comment, body: "Flagged newer comment", created_at: Time.now - 12.hours, flags_count: 3)
-      create(:comment, body: "Newer comment", created_at: Time.now)
+      create(:comment, body: "Flagged comment", created_at: Time.current - 1.day, flags_count: 5)
+      create(:comment, body: "Flagged newer comment", created_at: Time.current - 12.hours, flags_count: 3)
+      create(:comment, body: "Newer comment", created_at: Time.current)
 
       visit moderation_comments_path(order: 'newest')
 
diff --git a/spec/features/moderation/debates_spec.rb b/spec/features/moderation/debates_spec.rb
index 9d48123f2..78aca9b7e 100644
--- a/spec/features/moderation/debates_spec.rb
+++ b/spec/features/moderation/debates_spec.rb
@@ -177,9 +177,9 @@ feature 'Moderate debates' do
     end
 
     scenario "sorting debates" do
-      create(:debate, title: "Flagged debate", created_at: Time.now - 1.day, flags_count: 5)
-      create(:debate, title: "Flagged newer debate", created_at: Time.now - 12.hours, flags_count: 3)
-      create(:debate, title: "Newer debate", created_at: Time.now)
+      create(:debate, title: "Flagged debate", created_at: Time.current - 1.day, flags_count: 5)
+      create(:debate, title: "Flagged newer debate", created_at: Time.current - 12.hours, flags_count: 3)
+      create(:debate, title: "Newer debate", created_at: Time.current)
 
       visit moderation_debates_path(order: 'created_at')
 
diff --git a/spec/features/moderation/proposals_spec.rb b/spec/features/moderation/proposals_spec.rb
index 956ca611c..ab8da4764 100644
--- a/spec/features/moderation/proposals_spec.rb
+++ b/spec/features/moderation/proposals_spec.rb
@@ -169,9 +169,9 @@ feature 'Moderate proposals' do
     end
 
     scenario "sorting proposals" do
-      create(:proposal, title: "Flagged proposal", created_at: Time.now - 1.day, flags_count: 5)
-      create(:proposal, title: "Flagged newer proposal", created_at: Time.now - 12.hours, flags_count: 3)
-      create(:proposal, title: "Newer proposal", created_at: Time.now)
+      create(:proposal, title: "Flagged proposal", created_at: Time.current - 1.day, flags_count: 5)
+      create(:proposal, title: "Flagged newer proposal", created_at: Time.current - 12.hours, flags_count: 3)
+      create(:proposal, title: "Newer proposal", created_at: Time.current)
 
       visit moderation_proposals_path(order: 'created_at')
 
diff --git a/spec/features/official_positions_spec.rb b/spec/features/official_positions_spec.rb
index 01f78370a..971a8fc6d 100644
--- a/spec/features/official_positions_spec.rb
+++ b/spec/features/official_positions_spec.rb
@@ -50,7 +50,7 @@ feature 'Official positions' do
         @proposal1 = create(:proposal, author: @user1)
         @proposal2 = create(:proposal, author: @user2)
 
-        featured_proposals = 3.times { create(:proposal) }
+        create_featured_proposals
       end
 
       scenario "Index" do
diff --git a/spec/features/proposal_ballots_spec.rb b/spec/features/proposal_ballots_spec.rb
new file mode 100644
index 000000000..01ba71bf7
--- /dev/null
+++ b/spec/features/proposal_ballots_spec.rb
@@ -0,0 +1,55 @@
+# coding: utf-8
+require 'rails_helper'
+
+feature 'Proposal ballots' do
+
+  scenario 'Banner shows in proposal index' do
+    create_featured_proposals
+
+    visit proposals_path
+    expect(page).to_not have_css("#next-voting")
+    expect(page).to have_css("#featured-proposals")
+
+    create_successfull_proposals
+
+    visit proposals_path
+
+    expect(page).to have_css("#next-voting")
+    expect(page).to_not have_css("#featured-proposals")
+  end
+
+  scenario 'Successfull proposals do not show support buttons in index' do
+    successfull_proposals = create_successfull_proposals
+
+    visit proposals_path
+
+    successfull_proposals.each do |proposal|
+      within("#proposal_#{proposal.id}_votes") do
+        expect(page).to have_content "This proposal has reached the required supports"
+      end
+    end
+  end
+
+  scenario 'Successfull proposals do not show support buttons in show' do
+    successfull_proposals = create_successfull_proposals
+
+    successfull_proposals.each do |proposal|
+      visit proposal_path(proposal)
+      within("#proposal_#{proposal.id}_votes") do
+        expect(page).to have_content "This proposal has reached the required supports"
+      end
+    end
+  end
+
+  scenario 'Successfull proposals are listed in the proposal ballots index' do
+    successfull_proposals = create_successfull_proposals
+
+    visit proposal_ballots_path
+
+    successfull_proposals.each do |proposal|
+      expect(page).to have_content(proposal.title)
+    end
+  end
+
+end
+
diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb
index c7be4956b..aaf7d9dd9 100644
--- a/spec/features/proposals_spec.rb
+++ b/spec/features/proposals_spec.rb
@@ -3,48 +3,50 @@ require 'rails_helper'
 
 feature 'Proposals' do
 
-  scenario 'Index' do
-    featured_proposals = create_featured_proposals
-    proposals = [create(:proposal), create(:proposal), create(:proposal)]
+  context 'Index' do
+    scenario 'Lists featured and regular proposals' do
+      featured_proposals = create_featured_proposals
+      proposals = [create(:proposal), create(:proposal), create(:proposal)]
 
-    visit proposals_path
+      visit proposals_path
 
-    expect(page).to have_selector('#proposals .proposal-featured', count: 3)
-    featured_proposals.each do |featured_proposal|
-      within('#featured-proposals') do
-        expect(page).to have_content featured_proposal.title
-        expect(page).to have_css("a[href='#{proposal_path(featured_proposal)}']")
+      expect(page).to have_selector('#proposals .proposal-featured', count: 3)
+      featured_proposals.each do |featured_proposal|
+        within('#featured-proposals') do
+          expect(page).to have_content featured_proposal.title
+          expect(page).to have_css("a[href='#{proposal_path(featured_proposal)}']")
+        end
+      end
+
+      expect(page).to have_selector('#proposals .proposal', count: 3)
+      proposals.each do |proposal|
+        within('#proposals') do
+          expect(page).to have_content proposal.title
+          expect(page).to have_css("a[href='#{proposal_path(proposal)}']", text: proposal.title)
+          expect(page).to have_css("a[href='#{proposal_path(proposal)}']", text: proposal.summary)
+        end
       end
     end
 
-    expect(page).to have_selector('#proposals .proposal', count: 3)
-    proposals.each do |proposal|
-      within('#proposals') do
-        expect(page).to have_content proposal.title
-        expect(page).to have_css("a[href='#{proposal_path(proposal)}']", text: proposal.title)
-        expect(page).to have_css("a[href='#{proposal_path(proposal)}']", text: proposal.summary)
+    scenario 'Pagination' do
+      per_page = Kaminari.config.default_per_page
+      (per_page + 5).times { create(:proposal) }
+
+      visit proposals_path
+
+      expect(page).to have_selector('#proposals .proposal', count: per_page)
+
+      within("ul.pagination") do
+        expect(page).to have_content("1")
+        expect(page).to have_content("2")
+        expect(page).to_not have_content("3")
+        click_link "Next", exact: false
       end
+
+      expect(page).to have_selector('#proposals .proposal', count: 2)
     end
   end
 
-  scenario 'Paginated Index' do
-    per_page = Kaminari.config.default_per_page
-    (per_page + 5).times { create(:proposal) }
-
-    visit proposals_path
-
-    expect(page).to have_selector('#proposals .proposal', count: per_page)
-
-    within("ul.pagination") do
-      expect(page).to have_content("1")
-      expect(page).to have_content("2")
-      expect(page).to_not have_content("3")
-      click_link "Next", exact: false
-    end
-
-    expect(page).to have_selector('#proposals .proposal', count: 2)
-  end
-
   scenario 'Show' do
     proposal = create(:proposal)
 
@@ -478,7 +480,7 @@ feature 'Proposals' do
     scenario 'Index do not list retired proposals by default' do
       create_featured_proposals
       not_retired = create(:proposal)
-      retired = create(:proposal, retired_at: Time.now)
+      retired = create(:proposal, retired_at: Time.current)
 
       visit proposals_path
 
@@ -492,7 +494,7 @@ feature 'Proposals' do
     scenario 'Index has a link to retired proposals list' do
       create_featured_proposals
       not_retired = create(:proposal)
-      retired = create(:proposal, retired_at: Time.now)
+      retired = create(:proposal, retired_at: Time.current)
 
       visit proposals_path
 
@@ -512,8 +514,8 @@ feature 'Proposals' do
     end
 
     scenario 'Retired proposals index has links to filter by retired_reason' do
-      unfeasible = create(:proposal, retired_at: Time.now, retired_reason: 'unfeasible')
-      duplicated = create(:proposal, retired_at: Time.now, retired_reason: 'duplicated')
+      unfeasible = create(:proposal, retired_at: Time.current, retired_reason: 'unfeasible')
+      duplicated = create(:proposal, retired_at: Time.current, retired_reason: 'duplicated')
 
       visit proposals_path(retired: 'all')
 
@@ -658,9 +660,9 @@ feature 'Proposals' do
     scenario 'Proposals are ordered by newest', :js do
       create_featured_proposals
 
-      create(:proposal, title: 'Best proposal',   created_at: Time.now)
-      create(:proposal, title: 'Medium proposal', created_at: Time.now - 1.hour)
-      create(:proposal, title: 'Worst proposal',  created_at: Time.now - 1.day)
+      create(:proposal, title: 'Best proposal',   created_at: Time.current)
+      create(:proposal, title: 'Medium proposal', created_at: Time.current - 1.hour)
+      create(:proposal, title: 'Worst proposal',  created_at: Time.current - 1.day)
 
       visit proposals_path
       click_link 'newest'
@@ -676,6 +678,108 @@ feature 'Proposals' do
     end
   end
 
+  feature 'Archived proposals' do
+
+    scenario 'show on archived tab' do
+      create_featured_proposals
+      archived_proposals = create_archived_proposals
+
+      visit proposals_path
+      click_link 'Archived'
+
+      within("#proposals-list") do
+        archived_proposals.each do |proposal|
+          expect(page).to have_content(proposal.title)
+        end
+      end
+    end
+
+    scenario 'do not show in other index tabs' do
+      create_featured_proposals
+      archived_proposal = create(:proposal, :archived)
+
+      visit proposals_path
+
+      within("#proposals-list") do
+        expect(page).to_not have_content archived_proposal.title
+      end
+
+      orders = %w{hot_score confidence_score created_at relevance}
+      orders.each do |order|
+        visit proposals_path(order: order)
+
+        within("#proposals-list") do
+          expect(page).to_not have_content archived_proposal.title
+        end
+      end
+    end
+
+    scenario 'do not show support buttons in index' do
+      create_featured_proposals
+      archived_proposals = create_archived_proposals
+
+      visit proposals_path(order: 'archival_date')
+
+      within("#proposals-list") do
+        archived_proposals.each do |proposal|
+          within("#proposal_#{proposal.id}_votes") do
+            expect(page).to have_content "This proposal has been archived and can't collect supports"
+          end
+        end
+      end
+    end
+
+    scenario 'do not show support buttons in show' do
+      archived_proposal = create(:proposal, :archived)
+
+      visit proposal_path(archived_proposal)
+      expect(page).to have_content "This proposal has been archived and can't collect supports"
+    end
+
+    scenario 'do not show in featured proposals section' do
+      featured_proposal = create(:proposal, :with_confidence_score, cached_votes_up: 100)
+      archived_proposal = create(:proposal, :archived, :with_confidence_score, cached_votes_up: 10000)
+
+      visit proposals_path
+
+      within("#featured-proposals") do
+        expect(page).to have_content(featured_proposal.title)
+        expect(page).to_not have_content(archived_proposal.title)
+      end
+      within("#proposals-list") do
+        expect(page).to_not have_content(featured_proposal.title)
+        expect(page).to_not have_content(archived_proposal.title)
+      end
+
+      click_link "Archived"
+
+      within("#featured-proposals") do
+        expect(page).to have_content(featured_proposal.title)
+        expect(page).to_not have_content(archived_proposal.title)
+      end
+      within("#proposals-list") do
+        expect(page).to_not have_content(featured_proposal.title)
+        expect(page).to have_content(archived_proposal.title)
+      end
+    end
+
+    scenario "Order by votes" do
+      create(:proposal, :archived, title: "Least voted").update_column(:confidence_score, 10)
+      create(:proposal, :archived, title: "Most voted").update_column(:confidence_score, 50)
+      create(:proposal, :archived, title: "Some votes").update_column(:confidence_score, 25)
+
+      visit proposals_path
+      click_link 'Archived'
+
+      within("#proposals-list") do
+        expect(all(".proposal")[0].text).to match "Most voted"
+        expect(all(".proposal")[1].text).to match "Some votes"
+        expect(all(".proposal")[2].text).to match "Least voted"
+      end
+    end
+
+  end
+
   context "Search" do
 
     context "Basic search" do
@@ -1068,7 +1172,7 @@ feature 'Proposals' do
     scenario "Reorder results maintaing search", :js do
       proposal1 = create(:proposal, title: "Show you got",      cached_votes_up: 10,  created_at: 1.week.ago)
       proposal2 = create(:proposal, title: "Show what you got", cached_votes_up: 1,   created_at: 1.month.ago)
-      proposal3 = create(:proposal, title: "Show you got",      cached_votes_up: 100, created_at: Time.now)
+      proposal3 = create(:proposal, title: "Show you got",      cached_votes_up: 100, created_at: Time.current)
       proposal4 = create(:proposal, title: "Do not display",    cached_votes_up: 1,   created_at: 1.week.ago)
 
       visit proposals_path
diff --git a/spec/features/tags_spec.rb b/spec/features/tags_spec.rb
index 7ac81c139..4ca42f5eb 100644
--- a/spec/features/tags_spec.rb
+++ b/spec/features/tags_spec.rb
@@ -198,4 +198,4 @@ feature 'Tags' do
 
   end
 
-end
+end
\ No newline at end of file
diff --git a/spec/features/tracks_spec.rb b/spec/features/tracks_spec.rb
index 059d2f679..a4b8a7ce6 100644
--- a/spec/features/tracks_spec.rb
+++ b/spec/features/tracks_spec.rb
@@ -3,24 +3,24 @@ require 'rails_helper'
 feature 'Tracking' do
 
   context 'Custom variable' do
-    
+
      scenario 'Usertype anonymous' do
       visit proposals_path
-      
-      expect(page.html).to include "anonymous"    
+
+      expect(page.html).to include "anonymous"
     end
 
-    scenario 'Usertype level_1_user' do  
+    scenario 'Usertype level_1_user' do
       create(:geozone)
       user = create(:user)
       login_as(user)
 
       visit proposals_path
-      
+
       expect(page.html).to include "level_1_user"
     end
 
-    scenario 'Usertype level_2_user' do  
+    scenario 'Usertype level_2_user' do
       create(:geozone)
       user = create(:user)
       login_as(user)
@@ -36,12 +36,12 @@ feature 'Tracking' do
       user = user.reload
       fill_in 'sms_confirmation_code', with: user.sms_confirmation_code
       click_button 'Send'
-      
+
       expect(page.html).to include "level_2_user"
-    end 
+    end
   end
 
-  context 'Tracking events' do 
+  context 'Tracking events' do
     scenario 'Verification: start census' do
       user = create(:user)
       login_as(user)
@@ -67,7 +67,7 @@ feature 'Tracking' do
       click_button 'Send'
 
       expect(page.html).to include "data-track-event-category=verification"
-      expect(page.html).to include "data-track-event-action=start_sms"   
+      expect(page.html).to include "data-track-event-action=start_sms"
     end
 
     scenario 'Verification: start sms' do
@@ -81,12 +81,12 @@ feature 'Tracking' do
       verify_residence
 
       fill_in 'sms_phone', with: "611111111"
-      click_button 'Send' 
+      click_button 'Send'
 
       expect(page.html).to include "data-track-event-category=verification"
-      expect(page.html).to include "data-track-event-action=start_sms"   
+      expect(page.html).to include "data-track-event-action=start_sms"
     end
-  
+
     scenario 'Verification: success sms' do
       create(:geozone)
       user = create(:user)
@@ -95,7 +95,7 @@ feature 'Tracking' do
       visit account_path
       click_link 'Verify my account'
 
-      verify_residence 
+      verify_residence
 
       fill_in 'sms_phone', with: "611111111"
       click_button 'Send'
@@ -128,7 +128,7 @@ feature 'Tracking' do
       click_link "Send me a letter with the code"
 
       expect(page.html).to include "data-track-event-category=verification"
-      expect(page.html).to include "data-track-event-action=start_letter"    
+      expect(page.html).to include "data-track-event-action=start_letter"
     end
   end
 end
diff --git a/spec/features/users_auth_spec.rb b/spec/features/users_auth_spec.rb
index 9e1e67ef9..e978e7bd2 100644
--- a/spec/features/users_auth_spec.rb
+++ b/spec/features/users_auth_spec.rb
@@ -52,7 +52,6 @@ feature 'Users' do
                                                uid: '12345',
                                                info: {name: 'manuela', email: 'manuelacarmena@example.com', verified: '1'}} }
 
-
       scenario 'Sign up when Oauth provider has a verified email' do
         OmniAuth.config.add_mock(:twitter, twitter_hash_with_verified_email)
 
@@ -285,4 +284,59 @@ feature 'Users' do
 
     expect(page).to have_content "Your password has been changed successfully."
   end
+
+  scenario 'Sign in, admin with password expired' do
+    user = create(:user, password_changed_at: Time.current - 1.year)
+    admin = create(:administrator, user: user)
+
+    login_as(admin.user)
+    visit root_path
+
+    expect(page).to have_content "Your password is expired"
+
+    fill_in 'user_current_password', with: 'judgmentday'
+    fill_in 'user_password', with: '123456789'
+    fill_in 'user_password_confirmation', with: '123456789'
+
+    click_button 'Change your password'
+
+    expect(page).to have_content "Password successfully updated"
+  end
+
+  scenario 'Sign in, admin without password expired' do
+    user = create(:user, password_changed_at: Time.current - 360.days)
+    admin = create(:administrator, user: user)
+
+    login_as(admin.user)
+    visit root_path
+
+    expect(page).to_not have_content "Your password is expired"
+  end
+
+  scenario 'Sign in, user with password expired' do
+    user = create(:user, password_changed_at: Time.current - 1.year)
+
+    login_as(user)
+    visit root_path
+
+    expect(page).to_not have_content "Your password is expired"
+  end
+
+  scenario 'Admin with password expired trying to use same password' do
+    user = create(:user, password_changed_at: Time.current - 1.year, password: '123456789')
+    admin = create(:administrator, user: user)
+
+    login_as(admin.user)
+    visit root_path
+
+    expect(page).to have_content "Your password is expired"
+
+    fill_in 'user_current_password', with: 'judgmentday'
+    fill_in 'user_password', with: '123456789'
+    fill_in 'user_password_confirmation', with: '123456789'
+    click_button 'Change your password'
+
+    expect(page).to have_content "must be different than the current password."
+  end
+
 end
diff --git a/spec/features/verification/email_spec.rb b/spec/features/verification/email_spec.rb
index 58a3f71fb..bf1ff9b37 100644
--- a/spec/features/verification/email_spec.rb
+++ b/spec/features/verification/email_spec.rb
@@ -4,7 +4,7 @@ feature 'Verify email' do
 
   scenario 'Verify' do
     user = create(:user,
-                  residence_verified_at: Time.now,
+                  residence_verified_at: Time.current,
                   document_number:       '12345678Z',
                   document_type:         'dni')
 
@@ -34,7 +34,7 @@ feature 'Verify email' do
   end
 
   scenario "Errors on token verification" do
-    user = create(:user, residence_verified_at: Time.now)
+    user = create(:user, residence_verified_at: Time.current)
 
     login_as(user)
     visit email_path(email_verification_token: "1234")
@@ -44,7 +44,7 @@ feature 'Verify email' do
 
   scenario "Errors on sending confirmation email" do
     user = create(:user,
-                  residence_verified_at: Time.now,
+                  residence_verified_at: Time.current,
                   document_number:       '12345678Z',
                   document_type:         'dni')
 
@@ -62,4 +62,4 @@ feature 'Verify email' do
 
     expect(page).to have_content "There was a problem with sending an email to your account"
   end
-end
\ No newline at end of file
+end
diff --git a/spec/features/verification/letter_spec.rb b/spec/features/verification/letter_spec.rb
index 9a9b2500b..3d5d14fd3 100644
--- a/spec/features/verification/letter_spec.rb
+++ b/spec/features/verification/letter_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 feature 'Verify Letter' do
 
   scenario 'Request a letter' do
-    user = create(:user, residence_verified_at: Time.now,
+    user = create(:user, residence_verified_at: Time.current,
                          confirmed_phone:       "611111111")
 
     login_as(user)
@@ -20,7 +20,7 @@ feature 'Verify Letter' do
   end
 
   scenario 'Go to office instead of send letter' do
-    user = create(:user, residence_verified_at: Time.now,
+    user = create(:user, residence_verified_at: Time.current,
                          confirmed_phone:       "611111111")
 
     login_as(user)
@@ -40,7 +40,7 @@ feature 'Verify Letter' do
   end
 
   scenario "Deny access unless verified phone/email" do
-    user = create(:user, residence_verified_at: Time.now)
+    user = create(:user, residence_verified_at: Time.current)
 
     login_as(user)
     visit new_letter_path
@@ -52,7 +52,7 @@ feature 'Verify Letter' do
   context "Code verification" do
 
     scenario "Valid verification user logged in" do
-      user = create(:user, residence_verified_at: Time.now,
+      user = create(:user, residence_verified_at: Time.current,
                            confirmed_phone:       "611111111",
                            letter_verification_code: "123456")
 
@@ -69,7 +69,7 @@ feature 'Verify Letter' do
     end
 
     scenario "Valid verification of user failing to add trailing zeros" do
-      user = create(:user, residence_verified_at: Time.now,
+      user = create(:user, residence_verified_at: Time.current,
                            confirmed_phone:       "611111111",
                            letter_verification_code: "012345")
 
@@ -86,7 +86,7 @@ feature 'Verify Letter' do
     end
 
     scenario "Valid verification user not logged in" do
-      user = create(:user, residence_verified_at: Time.now,
+      user = create(:user, residence_verified_at: Time.current,
                            confirmed_phone:       "611111111",
                            letter_verification_code: "123456")
 
@@ -110,7 +110,7 @@ feature 'Verify Letter' do
     end
 
     scenario "Error messages on verification" do
-      user = create(:user, residence_verified_at: Time.now,
+      user = create(:user, residence_verified_at: Time.current,
                            confirmed_phone:       "611111111")
 
       visit edit_letter_path
@@ -122,7 +122,7 @@ feature 'Verify Letter' do
     end
 
     scenario '6 tries allowed' do
-      user = create(:user, residence_verified_at:    Time.now,
+      user = create(:user, residence_verified_at:    Time.current,
                            confirmed_phone:          "611111111",
                            letter_verification_code: "123456")
 
diff --git a/spec/features/verification/sms_spec.rb b/spec/features/verification/sms_spec.rb
index 3bcc2ff68..f582079a6 100644
--- a/spec/features/verification/sms_spec.rb
+++ b/spec/features/verification/sms_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 feature 'SMS Verification' do
 
   scenario 'Verify' do
-    user = create(:user, residence_verified_at: Time.now)
+    user = create(:user, residence_verified_at: Time.current)
     login_as(user)
 
     visit new_sms_path
@@ -21,7 +21,7 @@ feature 'SMS Verification' do
   end
 
   scenario 'Errors on phone number' do
-    user = create(:user, residence_verified_at: Time.now)
+    user = create(:user, residence_verified_at: Time.current)
     login_as(user)
 
     visit new_sms_path
@@ -32,7 +32,7 @@ feature 'SMS Verification' do
   end
 
   scenario 'Errors on verification code' do
-    user = create(:user, residence_verified_at: Time.now)
+    user = create(:user, residence_verified_at: Time.current)
     login_as(user)
 
     visit new_sms_path
@@ -58,7 +58,7 @@ feature 'SMS Verification' do
   end
 
   scenario '5 tries allowed' do
-    user = create(:user, residence_verified_at: Time.now)
+    user = create(:user, residence_verified_at: Time.current)
     login_as(user)
 
     visit new_sms_path
@@ -77,4 +77,4 @@ feature 'SMS Verification' do
     expect(current_path).to eq(account_path)
   end
 
-end
\ No newline at end of file
+end
diff --git a/spec/features/verification/verification_path_spec.rb b/spec/features/verification/verification_path_spec.rb
index c6da931df..bc5d60317 100644
--- a/spec/features/verification/verification_path_spec.rb
+++ b/spec/features/verification/verification_path_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 feature 'Verification path' do
 
   scenario "User is an organization" do
-    user = create(:user, verified_at: Time.now)
+    user = create(:user, verified_at: Time.current)
     create(:organization, user: user)
 
     login_as(user)
@@ -13,7 +13,7 @@ feature 'Verification path' do
   end
 
   scenario "User is verified" do
-    user = create(:user, verified_at: Time.now)
+    user = create(:user, verified_at: Time.current)
 
     login_as(user)
     visit verification_path
@@ -23,8 +23,8 @@ feature 'Verification path' do
   end
 
   scenario "User requested a letter" do
-    user = create(:user, confirmed_phone: "623456789", residence_verified_at: Time.now,
-                         letter_requested_at: Time.now, letter_verification_code: "666")
+    user = create(:user, confirmed_phone: "623456789", residence_verified_at: Time.current,
+                         letter_requested_at: Time.current, letter_verification_code: "666")
 
     login_as(user)
     visit verification_path
@@ -33,7 +33,7 @@ feature 'Verification path' do
   end
 
   scenario "User is level two verified" do
-    user = create(:user, residence_verified_at: Time.now, confirmed_phone: "666666666")
+    user = create(:user, residence_verified_at: Time.current, confirmed_phone: "666666666")
 
     login_as(user)
     visit verification_path
@@ -42,7 +42,7 @@ feature 'Verification path' do
   end
 
   scenario "User received a verification sms" do
-    user = create(:user, residence_verified_at: Time.now, unconfirmed_phone: "666666666", sms_confirmation_code: "666")
+    user = create(:user, residence_verified_at: Time.current, unconfirmed_phone: "666666666", sms_confirmation_code: "666")
 
     login_as(user)
     visit verification_path
@@ -51,7 +51,7 @@ feature 'Verification path' do
   end
 
   scenario "User received verification email" do
-    user = create(:user, residence_verified_at: Time.now, email_verification_token: "1234")
+    user = create(:user, residence_verified_at: Time.current, email_verification_token: "1234")
 
     login_as(user)
     visit verification_path
@@ -64,7 +64,7 @@ feature 'Verification path' do
   end
 
   scenario "User has verified residence" do
-    user = create(:user, residence_verified_at: Time.now)
+    user = create(:user, residence_verified_at: Time.current)
 
     login_as(user)
     visit verification_path
@@ -86,7 +86,7 @@ feature 'Verification path' do
   end
 
   scenario "A verified user can not access verification pages" do
-    user = create(:user, verified_at: Time.now)
+    user = create(:user, verified_at: Time.current)
 
     login_as(user)
 
@@ -98,4 +98,5 @@ feature 'Verification path' do
       expect(page).to have_content 'Your account is already verified'
     end
   end
-end
\ No newline at end of file
+
+end
diff --git a/spec/features/verification/verified_user_spec.rb b/spec/features/verification/verified_user_spec.rb
index 38097004e..451ea03e5 100644
--- a/spec/features/verification/verified_user_spec.rb
+++ b/spec/features/verification/verified_user_spec.rb
@@ -4,7 +4,7 @@ feature 'Verified users' do
 
   scenario "Verified emails" do
     user = create(:user,
-                  residence_verified_at: Time.now,
+                  residence_verified_at: Time.current,
                   document_number:       '12345678Z')
 
     create(:verified_user,
@@ -29,7 +29,7 @@ feature 'Verified users' do
 
   scenario "Verified phones" do
     user = create(:user,
-                  residence_verified_at: Time.now,
+                  residence_verified_at: Time.current,
                   document_number:       '12345678Z')
 
     create(:verified_user,
@@ -54,7 +54,7 @@ feature 'Verified users' do
 
   scenario "No emails or phones" do
     user = create(:user,
-                  residence_verified_at: Time.now,
+                  residence_verified_at: Time.current,
                   document_number:       '12345678Z')
 
     create(:verified_user,
@@ -72,7 +72,7 @@ feature 'Verified users' do
 
   scenario "Select a verified email" do
     user = create(:user,
-              residence_verified_at: Time.now,
+              residence_verified_at: Time.current,
               document_number:       '12345678Z')
 
     verified_user = create(:verified_user,
@@ -92,7 +92,7 @@ feature 'Verified users' do
 
   scenario "Select a verified phone" do
     user = create(:user,
-                  residence_verified_at: Time.now,
+                  residence_verified_at: Time.current,
                   document_number:       '12345678Z')
 
     verified_user = create(:verified_user,
@@ -111,7 +111,7 @@ feature 'Verified users' do
 
   scenario "Continue without selecting any verified information" do
     user = create(:user,
-                  residence_verified_at: Time.now,
+                  residence_verified_at: Time.current,
                   document_number:       '12345678Z')
 
     create(:verified_user,
@@ -127,7 +127,7 @@ feature 'Verified users' do
   end
 
   scenario "No verified information" do
-    user = create(:user, residence_verified_at: Time.now)
+    user = create(:user, residence_verified_at: Time.current)
 
     login_as(user)
     visit verified_user_path
@@ -135,4 +135,4 @@ feature 'Verified users' do
     expect(current_path).to eq(new_sms_path)
   end
 
-end
\ No newline at end of file
+end
diff --git a/spec/features/votes_spec.rb b/spec/features/votes_spec.rb
index 0e394f314..693f0fdba 100644
--- a/spec/features/votes_spec.rb
+++ b/spec/features/votes_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 feature 'Votes' do
 
   background do
-    @manuela = create(:user, verified_at: Time.now)
+    @manuela = create(:user, verified_at: Time.current)
     @pablo = create(:user)
   end
 
diff --git a/spec/features/welcome_spec.rb b/spec/features/welcome_spec.rb
index a98ff6e43..73cd65f5c 100644
--- a/spec/features/welcome_spec.rb
+++ b/spec/features/welcome_spec.rb
@@ -45,7 +45,7 @@ feature "Welcome screen" do
   end
 
   scenario 'it is not shown to level-2 users' do
-    user = create(:user, residence_verified_at: Time.now, confirmed_phone: "123")
+    user = create(:user, residence_verified_at: Time.current, confirmed_phone: "123")
 
     login_through_form_as(user)
 
@@ -53,7 +53,7 @@ feature "Welcome screen" do
   end
 
   scenario 'it is not shown to level-3 users' do
-    user = create(:user, verified_at: Time.now)
+    user = create(:user, verified_at: Time.current)
 
     login_through_form_as(user)
 
diff --git a/spec/lib/email_digests_spec.rb b/spec/lib/email_digests_spec.rb
index ae2122793..76efffe2e 100644
--- a/spec/lib/email_digests_spec.rb
+++ b/spec/lib/email_digests_spec.rb
@@ -51,7 +51,7 @@ describe EmailDigest do
       user = create(:user)
 
       proposal_notification = create(:proposal_notification)
-      notification = create(:notification, notifiable: proposal_notification, user: user, emailed_at: Time.now)
+      notification = create(:notification, notifiable: proposal_notification, user: user, emailed_at: Time.current)
 
       email_digest = EmailDigest.new(user)
       expect(email_digest.pending_notifications?).to_not be
@@ -85,7 +85,7 @@ describe EmailDigest do
       user = create(:user)
 
       proposal_notification = create(:proposal_notification)
-      notification = create(:notification, notifiable: proposal_notification, user: user, emailed_at: Time.now)
+      create(:notification, notifiable: proposal_notification, user: user, emailed_at: Time.current)
 
       reset_mailer
       email_digest = EmailDigest.new(user)
@@ -124,4 +124,4 @@ describe EmailDigest do
 
   end
 
-end
\ No newline at end of file
+end
diff --git a/spec/models/abilities/common_spec.rb b/spec/models/abilities/common_spec.rb
index 2a30d44a5..ce90ab967 100644
--- a/spec/models/abilities/common_spec.rb
+++ b/spec/models/abilities/common_spec.rb
@@ -100,7 +100,7 @@ describe "Abilities::Common" do
   describe "when level 2 verified" do
     let(:own_spending_proposal) { create(:spending_proposal, author: user) }
     let(:own_direct_message) { create(:direct_message, sender: user) }
-    before{ user.update(residence_verified_at: Time.now, confirmed_phone: "1") }
+    before{ user.update(residence_verified_at: Time.current, confirmed_phone: "1") }
 
     it { should be_able_to(:vote, Proposal) }
     it { should be_able_to(:vote_featured, Proposal) }
@@ -130,7 +130,7 @@ describe "Abilities::Common" do
   describe "when level 3 verified" do
     let(:own_spending_proposal) { create(:spending_proposal, author: user) }
     let(:own_direct_message) { create(:direct_message, sender: user) }
-    before{ user.update(verified_at: Time.now) }
+    before{ user.update(verified_at: Time.current) }
 
     it { should be_able_to(:vote, Proposal) }
     it { should be_able_to(:vote_featured, Proposal) }
diff --git a/spec/models/debate_spec.rb b/spec/models/debate_spec.rb
index 7e6d851fe..1b94393d1 100644
--- a/spec/models/debate_spec.rb
+++ b/spec/models/debate_spec.rb
@@ -129,12 +129,12 @@ describe Debate do
     end
 
     it "should be true for level two verified users" do
-      user = create(:user, residence_verified_at: Time.now, confirmed_phone: "666333111")
+      user = create(:user, residence_verified_at: Time.current, confirmed_phone: "666333111")
       expect(debate.votable_by?(user)).to be true
     end
 
     it "should be true for level three verified users" do
-      user = create(:user, verified_at: Time.now)
+      user = create(:user, verified_at: Time.current)
       expect(debate.votable_by?(user)).to be true
     end
 
@@ -166,24 +166,24 @@ describe Debate do
 
     describe "from level two verified users" do
       it "should register vote" do
-        user = create(:user, residence_verified_at: Time.now, confirmed_phone: "666333111")
+        user = create(:user, residence_verified_at: Time.current, confirmed_phone: "666333111")
         expect {debate.register_vote(user, 'yes')}.to change{debate.reload.votes_for.size}.by(1)
       end
 
       it "should not increase anonymous votes counter " do
-        user = create(:user, residence_verified_at: Time.now, confirmed_phone: "666333111")
+        user = create(:user, residence_verified_at: Time.current, confirmed_phone: "666333111")
         expect {debate.register_vote(user, 'yes')}.to_not change{debate.reload.cached_anonymous_votes_total}
       end
     end
 
     describe "from level three verified users" do
       it "should register vote" do
-        user = create(:user, verified_at: Time.now)
+        user = create(:user, verified_at: Time.current)
         expect {debate.register_vote(user, 'yes')}.to change{debate.reload.votes_for.size}.by(1)
       end
 
       it "should not increase anonymous votes counter " do
-        user = create(:user, verified_at: Time.now)
+        user = create(:user, verified_at: Time.current)
         expect {debate.register_vote(user, 'yes')}.to_not change{debate.reload.cached_anonymous_votes_total}
       end
     end
@@ -225,7 +225,7 @@ describe Debate do
   end
 
   describe '#hot_score' do
-    let(:now) { Time.now }
+    let(:now) { Time.current }
 
     it "increases for newer debates" do
       old = create(:debate, :with_hot_score, created_at: now - 1.day)
@@ -611,7 +611,7 @@ describe Debate do
 
       it "should be able to reorder by created_at after searching" do
         recent  = create(:debate,  title: 'stop corruption', cached_votes_up: 1, created_at: 1.week.ago)
-        newest  = create(:debate,  title: 'stop corruption', cached_votes_up: 2, created_at: Time.now)
+        newest  = create(:debate,  title: 'stop corruption', cached_votes_up: 2, created_at: Time.current)
         oldest  = create(:debate,  title: 'stop corruption', cached_votes_up: 3, created_at: 1.month.ago)
 
         results = Debate.search('stop corruption')
diff --git a/spec/models/organization_spec.rb b/spec/models/organization_spec.rb
index c755413c1..402c0d092 100644
--- a/spec/models/organization_spec.rb
+++ b/spec/models/organization_spec.rb
@@ -9,17 +9,17 @@ describe Organization do
       expect(subject.verified?).to be false
     end
     it "is true when verified_at? exists" do
-      subject.verified_at = Time.now
+      subject.verified_at = Time.current
       expect(subject.verified?).to be true
     end
     it "is false when the organization was verified and then rejected" do
-      subject.verified_at = Time.now
-      subject.rejected_at = Time.now + 1
+      subject.verified_at = Time.current
+      subject.rejected_at = Time.current + 1
       expect(subject.verified?).to be false
     end
     it "is true when the organization was rejected and then verified" do
-      subject.rejected_at = Time.now
-      subject.verified_at = Time.now + 1
+      subject.rejected_at = Time.current
+      subject.verified_at = Time.current + 1
       expect(subject.verified?).to be true
     end
   end
@@ -29,17 +29,17 @@ describe Organization do
       expect(subject.rejected?).to be false
     end
     it "is true when rejected_at? exists" do
-      subject.rejected_at = Time.now
+      subject.rejected_at = Time.current
       expect(subject.rejected?).to be true
     end
     it "is true when the organization was verified and then rejected" do
-      subject.verified_at = Time.now
-      subject.rejected_at = Time.now + 1
+      subject.verified_at = Time.current
+      subject.rejected_at = Time.current + 1
       expect(subject.rejected?).to be true
     end
     it "is false when the organization was rejected and then verified" do
-      subject.rejected_at = Time.now
-      subject.verified_at = Time.now + 1
+      subject.rejected_at = Time.current
+      subject.verified_at = Time.current + 1
       expect(subject.rejected?).to be false
     end
   end
diff --git a/spec/models/proposal_spec.rb b/spec/models/proposal_spec.rb
index 247cd9e66..9a9e9e9bc 100644
--- a/spec/models/proposal_spec.rb
+++ b/spec/models/proposal_spec.rb
@@ -166,12 +166,12 @@ describe Proposal do
     let(:proposal) { create(:proposal) }
 
     it "should be true for level two verified users" do
-      user = create(:user, residence_verified_at: Time.now, confirmed_phone: "666333111")
+      user = create(:user, residence_verified_at: Time.current, confirmed_phone: "666333111")
       expect(proposal.votable_by?(user)).to be true
     end
 
     it "should be true for level three verified users" do
-      user = create(:user, verified_at: Time.now)
+      user = create(:user, verified_at: Time.current)
       expect(proposal.votable_by?(user)).to be true
     end
 
@@ -186,14 +186,14 @@ describe Proposal do
 
     describe "from level two verified users" do
       it "should register vote" do
-        user = create(:user, residence_verified_at: Time.now, confirmed_phone: "666333111")
+        user = create(:user, residence_verified_at: Time.current, confirmed_phone: "666333111")
         expect {proposal.register_vote(user, 'yes')}.to change{proposal.reload.votes_for.size}.by(1)
       end
     end
 
     describe "from level three verified users" do
       it "should register vote" do
-        user = create(:user, verified_at: Time.now)
+        user = create(:user, verified_at: Time.current)
         expect {proposal.register_vote(user, 'yes')}.to change{proposal.reload.votes_for.size}.by(1)
       end
     end
@@ -204,6 +204,13 @@ describe Proposal do
         expect {proposal.register_vote(user, 'yes')}.to change{proposal.reload.votes_for.size}.by(0)
       end
     end
+
+    it "should not register vote for archived proposals" do
+      user = create(:user, verified_at: Time.current)
+      archived_proposal = create(:proposal, :archived)
+
+      expect {archived_proposal.register_vote(user, 'yes')}.to change{proposal.reload.votes_for.size}.by(0)
+    end
   end
 
   describe '#cached_votes_up' do
@@ -223,7 +230,7 @@ describe Proposal do
   end
 
   describe '#hot_score' do
-    let(:now) { Time.now }
+    let(:now) { Time.current }
 
     it "increases for newer proposals" do
       old = create(:proposal, :with_hot_score, created_at: now - 1.day)
@@ -260,7 +267,7 @@ describe Proposal do
 
       it "increases with votes" do
         previous = proposal.hot_score
-        5.times { proposal.register_vote(create(:user, verified_at: Time.now), true) }
+        5.times { proposal.register_vote(create(:user, verified_at: Time.current), true) }
         expect(previous).to be < proposal.reload.hot_score
       end
 
@@ -310,7 +317,7 @@ describe Proposal do
 
       it "increases with like" do
         previous = proposal.confidence_score
-        5.times { proposal.register_vote(create(:user, verified_at: Time.now), true) }
+        5.times { proposal.register_vote(create(:user, verified_at: Time.current), true) }
         expect(previous).to be < proposal.confidence_score
       end
     end
@@ -605,7 +612,7 @@ describe Proposal do
 
       it "should be able to reorder by created_at after searching" do
         recent  = create(:proposal,  title: 'stop corruption', cached_votes_up: 1, created_at: 1.week.ago)
-        newest  = create(:proposal,  title: 'stop corruption', cached_votes_up: 2, created_at: Time.now)
+        newest  = create(:proposal,  title: 'stop corruption', cached_votes_up: 2, created_at: Time.current)
         oldest  = create(:proposal,  title: 'stop corruption', cached_votes_up: 3, created_at: 1.month.ago)
 
         results = Proposal.search('stop corruption')
@@ -644,28 +651,28 @@ describe Proposal do
     context "no results" do
 
       it "no words match" do
-        proposal = create(:proposal, title: 'save world')
+        create(:proposal, title: 'save world')
 
         results = Proposal.search('destroy planet')
         expect(results).to eq([])
       end
 
       it "too many typos" do
-        proposal = create(:proposal, title: 'fantastic')
+        create(:proposal, title: 'fantastic')
 
         results = Proposal.search('frantac')
         expect(results).to eq([])
       end
 
       it "too much stemming" do
-        proposal = create(:proposal, title: 'reloj')
+        create(:proposal, title: 'reloj')
 
         results = Proposal.search('superrelojimetro')
         expect(results).to eq([])
       end
 
       it "empty" do
-        proposal = create(:proposal, title: 'great')
+        create(:proposal, title: 'great')
 
         results = Proposal.search('')
         expect(results).to eq([])
@@ -786,28 +793,50 @@ describe Proposal do
   end
 
   describe "retired" do
-    before(:all) do
-      @proposal1 = create(:proposal)
-      @proposal2 = create(:proposal, retired_at: Time.now)
-    end
+    let!(:proposal1) { create(:proposal) }
+    let!(:proposal2) { create(:proposal, retired_at: Time.current) }
 
     it "retired? is true" do
-      expect(@proposal1.retired?).to eq false
-      expect(@proposal2.retired?).to eq true
+      expect(proposal1.retired?).to eq false
+      expect(proposal2.retired?).to eq true
     end
 
     it "scope retired" do
       retired = Proposal.retired
 
       expect(retired.size).to eq(1)
-      expect(retired.first).to eq(@proposal2)
+      expect(retired.first).to eq(proposal2)
     end
 
     it "scope not_retired" do
       not_retired = Proposal.not_retired
 
       expect(not_retired.size).to eq(1)
-      expect(not_retired.first).to eq(@proposal1)
+      expect(not_retired.first).to eq(proposal1)
+    end
+  end
+
+  describe "archived" do
+    let!(:new_proposal)      { create(:proposal) }
+    let!(:archived_proposal) { create(:proposal, :archived) }
+
+    it "archived? is true only for proposals created more than n (configured months) ago" do
+      expect(new_proposal.archived?).to eq false
+      expect(archived_proposal.archived?).to eq true
+    end
+
+    it "scope archived" do
+      archived = Proposal.archived
+
+      expect(archived.size).to eq(1)
+      expect(archived.first).to eq(archived_proposal)
+    end
+
+    it "scope archived" do
+      not_archived = Proposal.not_archived
+
+      expect(not_archived.size).to eq(1)
+      expect(not_archived.first).to eq(new_proposal)
     end
   end
 
diff --git a/spec/models/sms_spec.rb b/spec/models/sms_spec.rb
index 83723cb3c..8486a931f 100644
--- a/spec/models/sms_spec.rb
+++ b/spec/models/sms_spec.rb
@@ -19,4 +19,4 @@ describe Verification::Sms do
     expect(build(:verification_sms, phone: "555; DROP TABLE USERS")).to_not be_valid
   end
 
-end
+end
\ No newline at end of file
diff --git a/spec/models/spending_proposal_spec.rb b/spec/models/spending_proposal_spec.rb
index 911d97491..4ee7728ab 100644
--- a/spec/models/spending_proposal_spec.rb
+++ b/spec/models/spending_proposal_spec.rb
@@ -174,7 +174,7 @@ describe SpendingProposal do
       by_valuator = SpendingProposal.by_valuator(valuator1.id)
 
       expect(by_valuator.size).to eq(2)
-      expect(by_valuator.sort).to eq([spending_proposal1,spending_proposal3].sort)
+      expect(by_valuator.sort).to eq([spending_proposal1, spending_proposal3].sort)
     end
   end
 
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index b6084a971..d7235dc86 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -274,10 +274,10 @@ describe User do
       # Subdomains are also accepted
 
       Setting['email_domain_for_officials'] = 'officials.madrid.es'
-      user1 = create(:user, email: "john@officials.madrid.es", confirmed_at: Time.now)
-      user2 = create(:user, email: "john@yes.officials.madrid.es", confirmed_at: Time.now)
-      user3 = create(:user, email: "john@unofficials.madrid.es", confirmed_at: Time.now)
-      user4 = create(:user, email: "john@example.org", confirmed_at: Time.now)
+      user1 = create(:user, email: "john@officials.madrid.es", confirmed_at: Time.current)
+      user2 = create(:user, email: "john@yes.officials.madrid.es", confirmed_at: Time.current)
+      user3 = create(:user, email: "john@unofficials.madrid.es", confirmed_at: Time.current)
+      user4 = create(:user, email: "john@example.org", confirmed_at: Time.current)
 
       expect(user1.has_official_email?).to eq(true)
       expect(user2.has_official_email?).to eq(true)
@@ -332,7 +332,7 @@ describe User do
       it "returns users that have not been erased" do
         user1 = create(:user, erased_at: nil)
         user2 = create(:user, erased_at: nil)
-        user3 = create(:user, erased_at: Time.now)
+        user3 = create(:user, erased_at: Time.current)
 
         expect(User.active).to include(user1)
         expect(User.active).to include(user2)
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index c1d391b66..a40934d92 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -2,6 +2,7 @@ require 'factory_girl_rails'
 require 'database_cleaner'
 require 'email_spec'
 require 'devise'
+require 'knapsack'
 Dir["./spec/support/**/*.rb"].sort.each { |f| require f }
 
 RSpec.configure do |config|
@@ -9,7 +10,7 @@ RSpec.configure do |config|
 
   config.filter_run :focus
   config.run_all_when_everything_filtered = true
-  config.include Devise::TestHelpers, :type => :controller
+  config.include Devise::TestHelpers, type: :controller
   config.include FactoryGirl::Syntax::Methods
   config.include(EmailSpec::Helpers)
   config.include(EmailSpec::Matchers)
@@ -101,6 +102,7 @@ RSpec.configure do |config|
   # test failures related to randomization by passing the same `--seed` value
   # as the one that triggered the failure.
   Kernel.srand config.seed
-
-
 end
+
+# Parallel build helper configuration for travis
+Knapsack::Adapters::RSpecAdapter.bind
\ No newline at end of file
diff --git a/spec/support/common_actions.rb b/spec/support/common_actions.rb
index 607ccbac1..400341a83 100644
--- a/spec/support/common_actions.rb
+++ b/spec/support/common_actions.rb
@@ -25,7 +25,7 @@ module CommonActions
   end
 
   def login_as_authenticated_manager
-    login, user_key, date = "JJB042", "31415926", Time.now.strftime("%Y%m%d%H%M%S")
+    login, user_key, date = "JJB042", "31415926", Time.current.strftime("%Y%m%d%H%M%S")
     allow_any_instance_of(ManagerAuthenticator).to receive(:auth).and_return({login: login, user_key: user_key, date: date}.with_indifferent_access)
     visit management_sign_in_path(login: login, clave_usuario: user_key, fecha_conexion: date)
   end
@@ -164,10 +164,10 @@ module CommonActions
     expect(page).to have_selector('.in-favor a', visible: false)
   end
 
-   def expect_message_you_need_to_sign_in_to_vote_comments
+  def expect_message_you_need_to_sign_in_to_vote_comments
     expect(page).to have_content 'You must Sign in or Sign up to vote'
-    expect(page).to have_selector('.logged', visible: false)
-    expect(page).to have_selector('.not-logged', visible: true)
+    expect(page).to have_selector('.participation-allowed', visible: false)
+    expect(page).to have_selector('.participation-not-allowed', visible: true)
   end
 
   def expect_message_to_many_anonymous_votes
@@ -213,6 +213,16 @@ module CommonActions
      create(:debate, :with_confidence_score, cached_votes_up: 80)]
   end
 
+  def create_successfull_proposals
+    [create(:proposal, title: "Winter is coming", question: "Do you speak it?", cached_votes_up: Proposal.votes_needed_for_success + 100),
+     create(:proposal, title: "Fire and blood", question: "You talking to me?", cached_votes_up: Proposal.votes_needed_for_success + 1)]
+  end
+
+  def create_archived_proposals
+    [create(:proposal, title: "This is an expired proposal", created_at: Setting["months_to_archive_proposals"].to_i.months.ago),
+     create(:proposal, title: "This is an oldest expired proposal", created_at: (Setting["months_to_archive_proposals"].to_i + 2).months.ago)]
+  end
+
   def tag_names(tag_cloud)
     tag_cloud.tags.map(&:name)
   end
diff --git a/spec/support/locales/custom/en.yml b/spec/support/locales/custom/en.yml
new file mode 100644
index 000000000..f601a35bc
--- /dev/null
+++ b/spec/support/locales/custom/en.yml
@@ -0,0 +1,5 @@
+---
+en:
+  account:
+    show:
+      change_credentials_link: Overriden string with custom locales
diff --git a/spec/support/locales/en.yml b/spec/support/locales/en.yml
new file mode 100644
index 000000000..c1174677b
--- /dev/null
+++ b/spec/support/locales/en.yml
@@ -0,0 +1,5 @@
+---
+en:
+  account:
+    show:
+      change_credentials_link: Not overriden string with custom locales
diff --git a/spec/support/verifiable.rb b/spec/support/verifiable.rb
index 5baa5739f..53c5931cc 100644
--- a/spec/support/verifiable.rb
+++ b/spec/support/verifiable.rb
@@ -4,7 +4,7 @@ shared_examples_for "verifiable" do
   describe "#scopes" do
     describe "#level_three_verified" do
       it "returns level three verified users" do
-        user1 = create(:user, verified_at: Time.now)
+        user1 = create(:user, verified_at: Time.current)
         user2 = create(:user, verified_at: nil)
 
         expect(model.level_three_verified).to include(user1)
@@ -14,10 +14,10 @@ shared_examples_for "verifiable" do
 
     describe "#level_two_verified" do
       it "returns level two verified users" do
-        user1 = create(:user, confirmed_phone: "123456789", residence_verified_at: Time.now)
+        user1 = create(:user, confirmed_phone: "123456789", residence_verified_at: Time.current)
         user2 = create(:user, confirmed_phone: "123456789", residence_verified_at: nil)
-        user3 = create(:user, confirmed_phone: nil, residence_verified_at: Time.now)
-        user4 = create(:user, level_two_verified_at: Time.now)
+        user3 = create(:user, confirmed_phone: nil, residence_verified_at: Time.current)
+        user4 = create(:user, level_two_verified_at: Time.current)
 
         expect(model.level_two_verified).to include(user1)
         expect(model.level_two_verified).to_not include(user2)
@@ -28,11 +28,11 @@ shared_examples_for "verifiable" do
 
     describe "#level_two_or_three_verified" do
       it "returns level two or three verified users" do
-        user1 = create(:user, confirmed_phone: "123456789", residence_verified_at: Time.now)
-        user2 = create(:user, verified_at: Time.now)
+        user1 = create(:user, confirmed_phone: "123456789", residence_verified_at: Time.current)
+        user2 = create(:user, verified_at: Time.current)
         user3 = create(:user, confirmed_phone: "123456789", residence_verified_at: nil)
-        user4 = create(:user, confirmed_phone: nil, residence_verified_at: Time.now)
-        user5 = create(:user, level_two_verified_at: Time.now)
+        user4 = create(:user, confirmed_phone: nil, residence_verified_at: Time.current)
+        user5 = create(:user, level_two_verified_at: Time.current)
 
         expect(model.level_two_or_three_verified).to include(user1)
         expect(model.level_two_or_three_verified).to include(user2)
@@ -46,9 +46,9 @@ shared_examples_for "verifiable" do
       it "returns unverified users" do
         user1 = create(:user, verified_at: nil, confirmed_phone: nil)
         user2 = create(:user, verified_at: nil, residence_verified_at: nil, confirmed_phone: "123456789")
-        user3 = create(:user, verified_at: nil, residence_verified_at: Time.now, confirmed_phone: nil)
-        user4 = create(:user, verified_at: Time.now, residence_verified_at: Time.now, confirmed_phone: "123456789")
-        user5 = create(:user, level_two_verified_at: Time.now)
+        user3 = create(:user, verified_at: nil, residence_verified_at: Time.current, confirmed_phone: nil)
+        user4 = create(:user, verified_at: Time.current, residence_verified_at: Time.current, confirmed_phone: "123456789")
+        user5 = create(:user, level_two_verified_at: Time.current)
 
         expect(model.unverified).to include(user1)
         expect(model.unverified).to include(user2)
@@ -63,9 +63,9 @@ shared_examples_for "verifiable" do
         user1 = create(:user, verified_at: nil, confirmed_phone: nil)
         create(:failed_census_call, user: user1)
 
-        user2 = create(:user, verified_at: nil, residence_verified_at: Time.now, unconfirmed_phone: nil)
+        user2 = create(:user, verified_at: nil, residence_verified_at: Time.current, unconfirmed_phone: nil)
         user3 = create(:user, verified_at: nil, confirmed_phone: nil)
-        user4 = create(:user, verified_at: Time.now, residence_verified_at: Time.now, unconfirmed_phone: "123456789", confirmed_phone: "123456789")
+        user4 = create(:user, verified_at: Time.current, residence_verified_at: Time.current, unconfirmed_phone: "123456789", confirmed_phone: "123456789")
 
 
         expect(model.incomplete_verification).to include(user1)
@@ -78,7 +78,7 @@ shared_examples_for "verifiable" do
 
   describe "#methods" do
     it "residence_verified? is true only if residence_verified_at" do
-      user = create(:user, residence_verified_at: Time.now)
+      user = create(:user, residence_verified_at: Time.current)
       expect(user.residence_verified?).to eq(true)
 
       user = create(:user, residence_verified_at: nil)
@@ -94,13 +94,13 @@ shared_examples_for "verifiable" do
     end
 
     it "level_two_verified? is true if manually set, or if residence_verified_at and confirmed_phone" do
-      user = create(:user, level_two_verified_at: Time.now)
+      user = create(:user, level_two_verified_at: Time.current)
       expect(user.level_two_verified?).to eq(true)
 
-      user = create(:user, confirmed_phone: "123456789", residence_verified_at: Time.now)
+      user = create(:user, confirmed_phone: "123456789", residence_verified_at: Time.current)
       expect(user.level_two_verified?).to eq(true)
 
-      user = create(:user, confirmed_phone: nil, residence_verified_at: Time.now)
+      user = create(:user, confirmed_phone: nil, residence_verified_at: Time.current)
       expect(user.level_two_verified?).to eq(false)
 
       user = create(:user, confirmed_phone: "123456789", residence_verified_at: nil)
@@ -108,7 +108,7 @@ shared_examples_for "verifiable" do
     end
 
     it "level_three_verified? is true only if verified_at" do
-      user = create(:user, verified_at: Time.now)
+      user = create(:user, verified_at: Time.current)
       expect(user.level_three_verified?).to eq(true)
 
       user = create(:user, verified_at: nil)
@@ -119,7 +119,7 @@ shared_examples_for "verifiable" do
       user = create(:user, verified_at: nil, confirmed_phone: nil)
       expect(user.unverified?).to eq(true)
 
-      user = create(:user, verified_at: Time.now, confirmed_phone: "123456789", residence_verified_at: Time.now)
+      user = create(:user, verified_at: Time.current, confirmed_phone: "123456789", residence_verified_at: Time.current)
       expect(user.unverified?).to eq(false)
     end
 
@@ -146,17 +146,18 @@ shared_examples_for "verifiable" do
     end
 
     it "verification_letter_sent? is true only if user has letter_requested_at and letter_verification_code" do
-      user = create(:user, letter_requested_at: Time.now, letter_verification_code: "666")
+      user = create(:user, letter_requested_at: Time.current, letter_verification_code: "666")
       expect(user.verification_letter_sent?).to eq(true)
 
       user = create(:user, letter_requested_at: nil, letter_verification_code: "666")
       expect(user.verification_letter_sent?).to eq(false)
 
-      user = create(:user, letter_requested_at: Time.now, letter_verification_code: nil)
+      user = create(:user, letter_requested_at: Time.current, letter_verification_code: nil)
       expect(user.verification_letter_sent?).to eq(false)
 
       user = create(:user, letter_requested_at: nil, letter_verification_code: nil)
       expect(user.verification_letter_sent?).to eq(false)
     end
   end
-end
\ No newline at end of file
+
+end