Fixed testbed install.  Was missing add_is_comments migration in migration list.
	modified:   lib/generators/surveyor_gui/install_generator.rb
Added new partial for grid_dropdown
	modified:   app/controllers/questions_controller.rb -  check question type
	to see if grid or grid_dropdown should be rendered.

	new file:   app/views/questions/_grid_dropdown_fields.html.erb

	modified:   lib/assets/javascripts/surveyor_gui/surveyor_gui.js - pass question_type

	modified:   lib/surveyor_gui/models/question_type_methods.rb - change text of grid
	dropdown type.
Begin working on matrix of dropdowns.
	modified:   app/views/questions/_grid_dropdown_fields.html.erb - new partial
	modified:   lib/assets/javascripts/surveyor_gui/surveyor_gui.js - call to partial
	modified:   lib/surveyor_gui/models/question_methods.rb - add grid_columns_count
Grid Dropdowns working in question editor.

Still need back end processing and changes to surveyform.
	modified:   app/controllers/questions_controller.rb - modified
	render_grid_fields_partial to include an index parameter, creation
	of a question_group instance variable, and build out of column
	records.

	new file:   app/models/column.rb - new model to add a column dimension to
	grids when needed.  A grid dropdown  answer should be referenced
	by both a question_id (row) and column_id.

	modified:   app/models/permitted_params_decorator.rb - modified for columns.

	new file:   app/models/row.rb - looks like only columns needed.  May remove
	this model.

	new file:   app/views/questions/_grid_dropdown_columns.html.erb - partial for
	each column within a grid dropdown.

	modified:   app/views/questions/_grid_dropdown_fields.html.erb - modified to call
	grid_dropdown_columns partial.

	modified:   lib/assets/javascripts/surveyor_gui/surveyor_gui.js - when user changes the number
	of columns, call render_grid_fields_partial with a parameter for how many columns are needed.

	modified:   lib/assets/stylesheets/surveyor_gui/surveyor_gui.sass

	modified:   lib/generators/surveyor_gui/install_generator.rb - add column migration.

	new file:   lib/generators/surveyor_gui/templates/db/migrate/20140531225529_create_rows.rb -
	may delete this.

	new file:   lib/generators/surveyor_gui/templates/db/migrate/20140601011151_create_columns.rb
	migration for column table.

	new file:   lib/surveyor_gui/models/column_methods.rb - new column model.

	modified:   lib/surveyor_gui/models/question_group_methods.rb - has_many columns.

	modified:   lib/surveyor_gui/models/question_methods.rb - dropdown_column_count methods
	counts how many columns a question_group has.

	new file:   lib/surveyor_gui/models/row_methods.rb - may delete.
Grid dropdown correctly populating database.

	modified:   app/controllers/questions_controller.rb - determine if any new columns need to be built
	in render_grid_fields_partial.

	modified:   app/models/permitted_params_decorator.rb - whitelist for columns.  Add columns attributes
	to question_group whitelist.

	modified:   config/routes.rb - get rid of unnecessary route for grid_dropdown_columns partial.

	modified:   lib/generators/surveyor_gui/install_generator.rb - add column_id to answers.  grid dropdowns
	will need to iterate on both question_id and column_id.

	new file:   lib/generators/surveyor_gui/templates/db/migrate/20140602030330_add_column_id_to_answers.rb -
	add column_id to answers.

	modified:   lib/surveyor_gui/models/question_group_methods.rb - get rid of reject_ifs on accepts_nested_attributes.

	modified:   lib/surveyor_gui/models/question_methods.rb - add writer for question_group_attributes.

	modified:   lib/surveyor_gui/models/question_type_methods.rb - complete process_grid_columns_textbox and pass
	column_id through the chain of builder methods it calls.
Add column headings to grid dropdown on surveyform
	modified:   app/helpers/surveyform_helper.rb - add method for
	question_group_heading

	modified:   app/views/surveyforms/_question_group.html.erb - modify to
	use question_group_heading to generate grid header.

	modified:   lib/assets/stylesheets/surveyor_gui/surveyor_gui.sass
Basic dropdown grid functionality working.

But comments/other/omit still shaky for grid_dropdowns.
	modified:   app/helpers/surveyform_helper.rb - whitespace change.

	modified:   app/views/questions/_grid_dropdown_columns.html.erb -
	correct the numbering built into the placeholder for column name
	(e.g., "column 1", "column 1" fixed to "column 1", "column 2").

	modified:   app/views/surveyforms/_question_group.html.erb - add new
	class for grid_dropdown when a grid_dropdown.  Use with sass to
	get column names to appear at the top of the grid.

	modified:   app/views/surveyforms/_question_field.html.erb -
	when grid_dropdown, iterate through columns.

	modified:   lib/assets/stylesheets/surveyor_gui/surveyor_gui.sass

	modified:   lib/surveyor_gui/models/question_type_methods.rb - separate
	processing columns_textboxes from row_textboxes.  When grid_dropdown, and
	processing columns answers_textbox, pass a column_id to update in the
	answers row.  Only pass answers that match a particular column_id.
Grid dropdowns working :tada:

Got rid of "omit".  Doesn't seem to fit this format.
Fixed other, although it does not
add a text box when selected.  Could be made to do this with js, but
corresponding magic would be needed on Surveyor.  Not sure its
necessary.

Added cleanup when switching from grid_dropdown to grid_any/grid_other -
needed to delete orphan columns.  Not needed for other question_types,
since group will be deleted and take columns with it.

where clause on answers not picking up nil = null, so added "or IS NULL".
Creating dups otherwise.
	modified:   app/views/questions/_grid_dropdown_fields.html.erb -
	removed call to render _answer_options partial and replaced it with
	a skinnier version of the _answer_options, one that does not include
	omit.

	modified:   lib/surveyor_gui/models/question_type_methods.rb
Reduce number of columns in grid_dropdown if user changes selection
	modified:   app/controllers/questions_controller.rb - if column count is
	greater than the number of columns requested, ask question_group to delete some
	columns

	modified:   lib/assets/javascripts/surveyor_gui/surveyor_gui.js - Make sure to pass
	a null index (NaN) rather than 0 if the user has not yet asked for a specific number
	of columns.

	modified:   lib/surveyor_gui/models/question_group_methods.rb - add trim_columns method
	to get rid of excess (more than the user wants) columns.
Merge remote-tracking branch 'upstream/show_groups_in_surveyform' into modify_started_survey

Conflicts:
	lib/surveyor_gui/models/question_methods.rb