restore stepped on change to answer methods.
Still trying to recover missing changes
	modified:   app/controllers/questions_controller.rb
	new file:   app/views/questions/_no_picks.html.erb
	new file:   app/views/questions/_picks.html.erb
	modified:   config/routes.rb
	modified:   lib/assets/javascripts/surveyor_gui/surveyor_gui.js
	modified:   lib/assets/stylesheets/surveyor_gui.sass
	modified:   lib/surveyor_gui/models/answer_methods.rb
	modified:   lib/surveyor_gui/models/question_methods.rb
tried removing hidden field text from _no_picks.html.erb

	modified:   app/views/questions/_no_picks.html.erb - got rid of hidden text field
	modified:   app/views/surveyforms/_question_fields.html.erb - removed instance attribute for prefix/suffix
	modified:   lib/surveyor_gui/models/answer_methods.rb - put ins ome debuggers
Put back in hidden field for text in _no_picks.html.erb

	app/views/questions/_no_picks.html.erb - put back hidden field for text.  Needed to apply setter for prefix/suffix.
	lib/surveyor_gui/models/answer_methods.rb - removed text setter - no longer needed.
Got switch from pick to no pick/number working

	modified:   app/controllers/questions_controller.rb - set text to orig choice when switching to pick
	modified:   app/helpers/question_helper.rb - restore stepped on code
	modified:   lib/surveyor_gui/models/answer_methods.rb - get rid of debugging stubs
Fixed the lingering prefix, suffix error (finally, I think).

Extracting the Question and Answer models (which were extensions to the
original Surveyor models) to a module, in the style of Surveyor, broke
the setter for answers.text.  In the case of a number, the setter was
supposed to look at the number prefix and suffix, and use those to set
the text field (the prefix followed by "|" followed by sufix).

However, because the accepts_nested_attributes call was now being set
using base.send, the prefix and suffix setters, which changed answer.first.text,
were being overrode by the text setter created by accepts_nested_attributes.  This
was the opposite of the required behaviour.

Tried creating a text setter method in the module, but that didn't work either.
It never got called.

The solution was to create an alternative text setter using the class_eval call on
base.  The new text setter successfully overrides the default text setter created by
accepts_nested_attributes.

The new text setter only set the text if the question_type is not number.  If the question_type
is number, the prefix and suffix setters do the work, and are not stepped on by the text setter.

	app/controllers/questions_controller.rb: make sure to set text back to original_choice when switching to a multiple
	choice (pick) question - changed render_picks_partial.  Uses update_attribute against the text field.

	app/views/questions/_no_picks.html.erb: minor change to format the width of the suffix/prefix fields.  Got stepped on
	somewhere back in the commit trail.

	lib/assets/stylesheets/surveyor_gui.sass: part of the formatting change for suffix/prefix.

	lib/surveyor_gui/models/answer_methods.rb: reverted to an older version that mirrors the original code taken from
	evaluationrx.com.

	lib/surveyor_gui/models/question_methods.rb: use class_eval to set a new text setter on base.  Restore
	setters for prefix and suffix
Fixed question number prefix and suffix getter.

	question_methods.rb: got rid of extraneous attr_accessor call

	_question_fields.html.erb: removed creation of instance variable
added some image files
modified surveyor_gui_all.css to pull in ui-lightness
Fixed broken links to jquery ui icons

	surveyor_gui_all.css: pull in ui-lightness theme
Replace the default simple_form initialization file with a modified version

        install_generator.rb: remove the simple_form.rb initializer installed
        by the simple_form gem.  Use the template command to add a copy
        from surveyor_gui templates back in.

        simple_form.rb: modified to change the format of radio/checkboxes
modified question_methods.rb to fix date
modified
Merge branch 'goback'

Conflicts:
	app/controllers/questions_controller.rb
	app/helpers/question_helper.rb
	app/views/questions/_form.html.erb
	config/routes.rb
	lib/assets/javascripts/surveyor_gui/surveyor_gui.js
	lib/assets/stylesheets/surveyor_gui.sass
	lib/surveyor_gui/models/question_methods.rb