Merge branch 'master' into better_rails4
Merge branch 'answers_from_text' of github.com:kjayma/surveyor_gui into answers_from_text
Added answers_collection method to Question model
Merge branch 'answers_from_text' of github.com:kjayma/surveyor_gui into answers_from_text
Added answers_collection method to Question model

	modified:   lib/surveyor_gui/models/question_methods.rb
	new file:   spec/models/surveyor_gui/question_spec.rb
	new file:   spec/views/questions/edit.html.erb_spec.rb
Merge branch 'answers_from_text' of github.com:kjayma/surveyor_gui into answers_from_text
Switching creation of answers to textbox instead of rows.

Passes tests except features.  Precursor to adding grids.
	modified:   app/models/permitted_params_decorator.rb
	modified:   app/views/questions/_picks.html.erb
	modified:   lib/assets/javascripts/surveyor_gui/surveyor_gui.js
	modified:   lib/assets/stylesheets/surveyor_gui/surveyor_gui.sass
	modified:   lib/surveyor_gui/models/answer_methods.rb
	modified:   lib/surveyor_gui/models/question_methods.rb
	modified:   spec/features/create_survey_spec.rb
	modified:   spec/models/surveyor_gui/question_spec.rb
	modified:   spec/views/questions/edit.html.erb_spec.rb
Added answers_collection method to Question model
Added answers_collection method to Question model

	modified:   lib/surveyor_gui/models/question_methods.rb
	new file:   spec/models/surveyor_gui/question_spec.rb
	new file:   spec/views/questions/edit.html.erb_spec.rb
Switching creation of answers to textbox instead of rows.

Passes tests except features.  Precursor to adding grids.
	modified:   app/models/permitted_params_decorator.rb
	modified:   app/views/questions/_picks.html.erb
	modified:   lib/assets/javascripts/surveyor_gui/surveyor_gui.js
	modified:   lib/assets/stylesheets/surveyor_gui/surveyor_gui.sass
	modified:   lib/surveyor_gui/models/answer_methods.rb
	modified:   lib/surveyor_gui/models/question_methods.rb
	modified:   spec/features/create_survey_spec.rb
	modified:   spec/models/surveyor_gui/question_spec.rb
	modified:   spec/views/questions/edit.html.erb_spec.rb
Merge branch 'master' of github.com:kjayma/surveyor_gui into answers_from_text
Merge branch 'answers_from_text' of github.com:kjayma/surveyor_gui into answers_from_text
Fixed error caused by answers_textbox processing on non-pick questions

	modified:   app/views/questions/_answer_fields.html.erb - put the
		    answers_textbox field in the answers partial

	modified:   app/views/questions/_picks.html.erb - remove the
		    answers_textbox field and put it in the answers partial.
		    this prevents answers_textbox from being sent as  a
	            parameter on non-pick questions.

	modified:   lib/surveyor_gui/models/question_methods.rb - as an
	            additional safeguard, don't process answers_textbox setter
		    on non pick questions.

	modified:   lib/assets/javascripts/surveyor_gui/surveyor_gui.js - restore ready
		    statement to insert _answer_fields_partial when pick.
Merge branch 'master' into answers_from_text
Merge branch 'answers_from_text' of github.com:kjayma/surveyor_gui into answers_from_text
Answers_textbox processing is green!
	modified:   app/views/questions/_answer_fields.html.erb - removed answers_textbox
	and restored div.sortable_questions.  Restores js functionality.

	modified:   app/views/questions/_picks.html.erb - inserted answers_textbox

	modified:   lib/surveyor_gui/models/question_methods.rb - removed customer
	answers_textbox writer.  Replaced with an after_save hook which calls
	process_answers_textbox.  This successfully protects against processing answers_textbox
	for a non-pick question.

	modified:   spec/models/surveyor_gui/question_spec.rb - corrected errors.

	modified:   spec/support/surveyforms_creation_helpers.rb - changed to add answers using
	answers_textbox

	modified:   spec/views/questions/edit.html.erb_spec.rb - can't run a test
		    because it depends on js.  Comment out.
Fix mistake in text of test example.
	modified:   spec/views/surveyforms/edit.html.erb_spec.rb
Added test for multiple choice questions to edit.html.erb_spec.rb

Had to fix errors in routes that work with webrick but fail with
rspec.  Had to add survey.id to a bunch of _url and _path calls.
	modified:   app/views/surveyforms/_form.html.erb

	modified:   app/views/surveyforms/_question_fields.html.erb

	modified:   app/views/surveyforms/_survey_section_fields.html.erb

	modified:   spec/views/surveyforms/edit.html.erb_spec.rb
Added specs to surveyform view to test grid questions.  They are red.

	modified:   spec/views/surveyforms/edit.html.erb_spec.rb
Initial support for grids and question groups on surveyforms.

Doesn't handle improv sketch. Doesn't handle sliders.  Does
handle other grids pretty well.

Doesn't correct behavior of add_buttons for grids.

Think about ways to reduce complexity.

Ajax not yet adjusted.
	modified:   app/helpers/surveyform_helper.rb - added helpers to support
	question groups and a new class for QuestionGroupTracker.  Takes a slightly
	different approach to rendering question groups than Surveyor.

	new file:   app/views/surveyforms/_question_field.html.erb - extracted this new
	partial from  _question_fields because it can be shared with both questions and
	question groups.

	new file:   app/views/surveyforms/_question_group.html.erb - surrounds a question group
	with button bars. Calls render_one_queston_group in helpers.  This helper then renders
	question_group_fields.

	new file:   app/views/surveyforms/_question_group_fields.html.erb - very small partial which
	wraps question_field in div for a row.

	new file:   app/views/surveyforms/_question_group_section.html.erb - wraps question_groups to allow
	for ajax calls.

	new file:   app/views/surveyforms/_question_name_and_number.html.erb - Small partial that provides
	what it says.

	modified:   app/views/surveyforms/_question_section.html.erb - account for renaming of _question_fields
	to _question_wrapper

	new file:   app/views/surveyforms/_question_wrapper.html.erb - renamed question_field partial.

	modified:   app/views/surveyforms/_survey_section_fields.html.erb - call helper render_question_and_groups_helper
	to render both questions and groups.  Formerly, just rendered questions.

	modified:   lib/assets/stylesheets/surveyor_gui/surveyor_gui.sass
	deleted:    app/views/surveyforms/_question_fields.html.erb