merges master and fixes conflicts

2015-08-23 20:27:11 +02:00
parent 720630e0ab 8f2cec60bf
commit c88f7c1f30
68 changed files with 538 additions and 368 deletions
--- a/spec/features/admin/officials_spec.rb
+++ b/spec/features/admin/officials_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 feature 'Admin officials' do

  background do
-    @citizen = create(:user, first_name: "Citizen", last_name: "Kane")
+    @citizen = create(:user, username: "Citizen Kane")
    @official = create(:user, official_position: "Mayor", official_level: 5)
    @admin = create(:administrator)
    login_as(@admin.user)