Fixed survey bug. Worked on notifications and blog posts - views and forms
Add SimpleCov test coverage configuration, closes openpprn/opn#56.
Updated seeds
Merge pull request #57 from openpprn/simplecov-test-coverage-config

Add SimpleCov test coverage configuration, closes openpprn/opn#56.
Updated tests. Test are all passing
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into 1-0-stable
Fixed myapnea/www_myapnea_org#29
Closed myapnea/www_myapnea_org#33. Closed myapnea/www_myapnea_org#32. Closed myapnea/www_myapnea_org#30. Closed myapnea/www_myapnea_org#34. Closed myapnea/www_myapnea_org#36.
Merge branch '1-0-stable' of github.com:myapnea/www_myapnea_org into 1-0-stable
Worked on research democracy
Research topic voting (openpprn/opn#7) is implemented.
Added tests for openpprn/opn#7
Merge branch '1-0-stable' into 1-0-dev
Merge remote-tracking branch 'upstream/R2.0' into 1-0-dev

Conflicts:
	Gemfile.lock
	app/assets/javascripts/votes.js.coffee
	app/controllers/account_controller.rb
	app/controllers/application_controller.rb
	app/controllers/research_controller.rb
	app/models/user.rb
	app/views/account/account.html.haml
	app/views/account/consent.html.haml
	app/views/account/privacy_policy.html.haml
	app/views/admin/blog.html.haml
	app/views/blog/blog.html.haml
	app/views/layouts/_flash_messages.html.haml
	app/views/research/research_question.html.haml
	app/views/research/research_topics.html.haml
	app/views/shared/_blog_posts.html.haml
	app/views/surveys/partials/_rate_question.html.haml
	config/routes.rb
	db/schema.rb
	db/seeds.rb
	test/controllers/account_controller_test.rb
	test/controllers/social_controller_test.rb
	test/controllers/static_controller_test.rb
	test/fixtures/questions.yml
Fixed bug where unvoted questions did not show up for openpprn/opn#7
Merge remote-tracking branch 'upstream/R2.0' into 1-0-dev
Fixed myapnea/myapnea#41