Restore label to question types on question editor
	modified:   app/views/questions/_form.html.erb
Restore squashed question_types (number, date, file upload, text box, label)
	modified:   lib/surveyor_gui/models/question_type_methods.rb - was incorrectly
	checking display type for these fields when the relevant data was in the first answer
	record in the response_class attribute.

	modified:   spec/support/surveyforms_creation_helpers.rb - modified with .question_type_id to be
	.question_type.
Tests green again.

Added test for grid dropdowns, but more needed.
	modified:   app/controllers/questions_controller.rb - when building new
	question, and building a nested answer, make sure the answer defaults to
	to response_class :string.  Needed to get a new question to default to the
	:string question_type.

	modified:   app/helpers/surveyor_helper.rb - uncomment reference to surveyor_helper_methods.rb in
	Surveyor.  Although this does not impact a live application, it was necessary to make tests green.

	modified:   lib/surveyor_gui/models/question_type_methods.rb - when trying to find a match on
	question_type, assume answer.response_type is :string if no answer has been built yet.  This ensures
	a match to :string question_type for freshly built questions with default data.

	modified:   spec/factories.rb - add columns.

	modified:   spec/features/create_survey_spec.rb - fix file upload

	modified:   spec/models/surveyor_gui/question_spec.rb - let :answer statements now need to set
	response_class => :answer to make test green.

	modified:   spec/models/surveyor_gui/question_type_spec.rb - pick :nones were setting display_type in
	question where they should have been setting response_class in answer.

	modified:   spec/support/surveyforms_creation_helpers.rb - commented out within for .question_type when
	choosing questions.

	modified:   spec/support/surveyforms_rearrangement_helpers.rb - added a sleep 1 before paste.

	modified:   spec/views/surveyforms/edit.html.erb_spec.rb - restructured let statements to use new
	textbox fields and added a test for grid_dropdown.
Add check for prefix/suffix and fix order issue.
	modified:   app/controllers/questions_controller.rb - fix
	check for display_order of previous question.  Needs to use
	the display_order of the last question in a group, if a group.

	modified:   spec/views/surveyforms/edit.html.erb_spec.rb
Fixed prefix/suffix and improved feature test.
	modified:   lib/surveyor_gui/models/question_methods.rb
	modified:   spec/features/create_survey_spec.rb
Fix dependency editor for question_types other than grid_dropdown

	modified:   app/controllers/dependencys_controller.rb - changed
	one statement from question.question_type.id to question.question_type_id
	to avoid extra db query.

	modified:   lib/assets/javascripts/surveyor_gui/surveyor_gui.js - use new
	question_type taxonomy.
Merge remote-tracking branch 'upstream/show_groups_in_surveyform' into temp