Fixed grouping of answers to allow first survey to complete
Merge pull request #24 from openpprn/R2.0

Fixed grouping of answers to allow first survey to complete
Merge branch '1-0-stable' into 1-0-dev
Research page updated and Instructions style created
Updated faqs and team pages
Updated dashboard, registration, social profile, and overview pages
Made navbar collapse earlier
Merge branch '1-0-stable' into 1-0-dev

Conflicts:
	app/views/static/faqs.html.haml
	app/views/static/research.html.haml
	app/views/static/share.html.haml
	app/views/static/team.html.haml