finish #278 - implementation of and tests for new fair trust questionnaire
Merge branch 'release' of github.com:fairnopoly/fairnopoly into release

Conflicts:
	app/assets/stylesheets/kopfwelt/_categories.scss
	app/assets/stylesheets/kopfwelt/_formtastic_changes.scss
	lib/autoload/fairtastic/form_builder.rb