Fixed survey bug. Worked on notifications and blog posts - views and forms
Small consent fix
Updated seeds
Updated tests. Test are all passing
Fixed myapnea/www_myapnea_org#29
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
Integrated research topic functionality (openpprn/opn#7) from openpprn to myapnea. Added myapnea-specific functionality - closed myapnea/www_myapnea_org#37
Changelog update