Merge branch 'loading_project' of https://github.com/openjaf/grocer into loading_project

Conflicts:
	app/assets/javascripts/application.js
	app/views/dashboard/shared/_nav_bar.html.erb
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch loading_project
# Your branch and 'origin/loading_project' have diverged,
# and have 4 and 17 different commits each, respectively.
#   (use "git pull" to merge the remote branch into yours)
#
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
#	new file:   .ruby-gemset
#	new file:   .ruby-version
#	modified:   Gemfile
#	new file:   Gemfile.lock
#	new file:   app/assets/javascripts/app.js
#	modified:   app/assets/javascripts/application.js
#	modified:   app/controllers/application_controller.rb
#	modified:   app/controllers/dashboard/overview_controller.rb
#	new file:   app/controllers/organization_steps_controller.rb
#	modified:   app/controllers/registrations_controller.rb
#	deleted:    app/controllers/user_steps_controller.rb
#	modified:   app/models/account.rb
#	new file:   app/models/account_scoped.rb
#	modified:   app/models/address.rb
#	modified:   app/models/adjustment.rb
#	modified:   app/models/classification.rb
#	new file:   app/models/devise_overrides.rb
#	modified:   app/models/dimension.rb
#	modified:   app/models/image.rb
#	modified:   app/models/line_item.rb
#	deleted:    app/models/members.rb
#	modified:   app/models/option.rb
#	modified:   app/models/order.rb
#	modified:   app/models/order_total.rb
#	modified:   app/models/organization.rb
#	modified:   app/models/payment.rb
#	modified:   app/models/product.rb
#	modified:   app/models/property.rb
#	modified:   app/models/shipment.rb
#	modified:   app/models/source.rb
#	modified:   app/models/taxon.rb
#	modified:   app/models/taxonomy.rb
#	modified:   app/models/user.rb
#	modified:   app/models/variant.rb
#	modified:   app/views/dashboard/shared/_nav_bar_sales.html.erb
#	modified:   app/views/devise/registrations/new.html.erb
#	modified:   app/views/layouts/_navigation.html.erb
#	new file:   app/views/organization_steps/_form.html.erb
#	new file:   app/views/organization_steps/organization.html.erb
#	new file:   app/views/organization_steps/organization_address.html.erb
#	deleted:    app/views/user_steps/_form.html.erb
#	deleted:    app/views/user_steps/organization.html.erb
#	deleted:    app/views/user_steps/organization_address.html.erb
#	modified:   config/environments/production.rb
#	modified:   config/initializers/devise.rb
#	modified:   config/routes.rb
#	deleted:    db/migrate/20140906181105_create_members.rb
#	deleted:    db/migrate/20140920150318_add_reference_to_accounts.rb
#	new file:   db/migrate/20140920205721_add_account_references_to_addresses.rb
#	new file:   db/migrate/20140920205908_add_account_references_to_adjustments.rb
#	new file:   db/migrate/20140920210040_add_account_references_to_dimensions.rb
#	new file:   db/migrate/20140920210111_add_account_references_to_images.rb
#	new file:   db/migrate/20140920210134_add_account_references_to_line_items.rb
#	new file:   db/migrate/20140920210204_add_account_references_to_options.rb
#	new file:   db/migrate/20140920210228_add_account_references_to_order_totals.rb
#	new file:   db/migrate/20140920210251_add_account_references_to_orders.rb
#	new file:   db/migrate/20140920210319_add_account_references_to_organizations.rb
#	new file:   db/migrate/20140920210350_add_account_references_to_payments.rb
#	new file:   db/migrate/20140920210407_add_account_references_to_products.rb
#	new file:   db/migrate/20140920210549_add_account_references_to_products_taxons.rb
#	new file:   db/migrate/20140920210608_add_account_references_to_properties.rb
#	new file:   db/migrate/20140920210622_add_account_references_to_shipments.rb
#	new file:   db/migrate/20140920210636_add_account_references_to_sources.rb
#	new file:   db/migrate/20140920210651_add_account_references_to_taxonomies.rb
#	new file:   db/migrate/20140920210730_add_account_references_to_taxons.rb
#	new file:   db/migrate/20140920211009_add_account_references_to_variants.rb
#	new file:   db/migrate/20140921000733_add_account_references_to_users.rb
#	modified:   db/schema.rb
#	modified:   lib/tasks/load_sample.rake
#