First swathe of CanCan authorizations
Merge branch 'master' into authorization

Conflicts:
	app/controllers/surveyor_controller.rb
Merge branch 'master' into authorization

Conflicts:
	app/controllers/surveyor_controller.rb
Merge branch 'master' into authorization
merged copy changes from Chris
Adding (rough) links to all user-flow pages for testing
update readme with all survey extensions
added text statements to answer
added statement_text methods
display the generated values
tests for the statement_texts
Merging changes to protootype survey
Merge branch 'master' into writing_tests
Merge pull request #111 from theodi/certificate-attributes

Certificate attributes
Merge pull request #108 from theodi/authorization

Authorization
Merge pull request #110 from theodi/merging_prototype_certificate

Merging changes to prototype survey
Merge pull request #109 from theodi/home_page_links

Adding (rough) links to all user-flow pages for testing
Merge branch 'master' into writing_tests

Conflicts:
	app/controllers/datasets_controller.rb
	app/models/response.rb