Merge branch 'develop' into 473_question_tags and resolve conflicts

Conflicts:
Gemfile.lock
app/models/ability.rb
app/models/question.rb
db/schema.rb