Merge branch 'master' of github.com:loomio/loomio into feature/file-upload

Conflicts:
	app/assets/javascripts/application.js
	app/assets/stylesheets/discussions.css.scss
	app/controllers/discussions_controller.rb
	app/models/comment.rb
	app/models/discussion.rb
	config/routes.rb
	db/schema.rb
	features/step_definitions/see_number_of_new_comments_steps.rb
	spec/extras/queries/unread_discussions_spec.rb
	spec/models/comment_spec.rb
	spec/models/discussion_spec.rb
	spec/models/user_spec.rb