update gems
add rails admin gem
solve merge conflict
Merge branch 'loading_project' into develop
putting session variables and fixing time line options
change logic for account
improve tag names
add datepicker
tryying to put datepickers
tryying to put datepickers
Merge branch 'datepicker' of https://github.com/openjaf/grocer into loading_project

Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css.scss
	app/assets/stylesheets/framework_and_overrides.css.scss
	app/views/dashboard/shared/_nav_bar.html.erb
Merge branch 'datepicker' of https://github.com/openjaf/grocer into loading_project

Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css.scss
	app/assets/stylesheets/framework_and_overrides.css.scss
	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 is ahead of 'origin/loading_project' by 3 commits.
#   (use "git push" to publish your local commits)
#
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
#	modified:   Gemfile
#	deleted:    Gemfile.lock
#	modified:   app/assets/stylesheets/framework_and_overrides.css.scss
#	new file:   app/controllers/dashboard/purchases/adjustments_controller.rb
#	new file:   app/controllers/dashboard/purchases/items_controller.rb
#	new file:   app/controllers/dashboard/purchases/product_controller.rb
#	new file:   app/controllers/dashboard/purchases/revenues_controller.rb
#	new file:   app/controllers/dashboard/purchases/shipments_controller.rb
#	new file:   app/controllers/dashboard/purchases/sources_controller.rb
#	new file:   app/controllers/dashboard/purchases/taxes_controller.rb
#	new file:   app/controllers/dashboard/purchases/transactions_controller.rb
#	modified:   app/controllers/user_steps_controller.rb
#	new file:   app/models/account.rb
#	new file:   app/models/members.rb
#	modified:   app/models/organization.rb
#	deleted:    app/models/organization_users.rb
#	modified:   app/models/user.rb
#	new file:   app/views/dashboard/purchases/adjustments/by_hours.html.erb
#	new file:   app/views/dashboard/purchases/adjustments/by_week_days.html.erb
#	new file:   app/views/dashboard/purchases/adjustments/index.html.erb
#	new file:   app/views/dashboard/purchases/items/by_hours.html.erb
#	new file:   app/views/dashboard/purchases/items/by_week_days.html.erb
#	new file:   app/views/dashboard/purchases/items/index.html.erb
#	new file:   app/views/dashboard/purchases/product/_circle_chart.html.erb
#	new file:   app/views/dashboard/purchases/product/_nav_bar_products.html.erb
#	new file:   app/views/dashboard/purchases/product/_nav_bar_value_products.html.erb
#	new file:   app/views/dashboard/purchases/product/by_brands.html.erb
#	new file:   app/views/dashboard/purchases/product/by_categories.html.erb
#	new file:   app/views/dashboard/purchases/product/by_value_brands.html.erb
#	new file:   app/views/dashboard/purchases/product/by_value_categories.html.erb
#	new file:   app/views/dashboard/purchases/revenues/by_hour.html.erb
#	new file:   app/views/dashboard/purchases/revenues/by_sources.html.erb
#	new file:   app/views/dashboard/purchases/revenues/by_status.html.erb
#	new file:   app/views/dashboard/purchases/revenues/by_wday.html.erb
#	new file:   app/views/dashboard/purchases/revenues/index.html.erb
#	new file:   app/views/dashboard/purchases/shipments/by_hours.html.erb
#	new file:   app/views/dashboard/purchases/shipments/by_week_days.html.erb
#	new file:   app/views/dashboard/purchases/shipments/index.html.erb
#	new file:   app/views/dashboard/purchases/sources/by_hours.html.erb
#	new file:   app/views/dashboard/purchases/sources/by_week_days.html.erb
#	new file:   app/views/dashboard/purchases/sources/index.html.erb
#	new file:   app/views/dashboard/purchases/taxes/by_hours.html.erb
#	new file:   app/views/dashboard/purchases/taxes/by_week_days.html.erb
#	new file:   app/views/dashboard/purchases/taxes/index.html.erb
#	new file:   app/views/dashboard/purchases/transactions/by_hours.html.erb
#	new file:   app/views/dashboard/purchases/transactions/by_week_days.html.erb
#	new file:   app/views/dashboard/purchases/transactions/index.html.erb
#	modified:   app/views/dashboard/sales/revenues/index.html.erb
#	modified:   app/views/dashboard/shared/_nav_bar_sales.html.erb
#	modified:   app/views/layouts/_navigation.html.erb
#	modified:   app/views/layouts/application.html.erb
#	modified:   app/views/user_steps/_form.html.erb
#	modified:   app/views/user_steps/organization.html.erb
#	modified:   app/views/user_steps/organization_address.html.erb
#	new file:   config/initializers/rails_admin.rb
#	modified:   config/routes.rb
#	new file:   db/migrate/20140905013116_create_accounts.rb
#	renamed:    db/migrate/20140905013116_create_organizations.rb -> db/migrate/20140905013117_create_organizations.rb
#	new file:   db/migrate/20140906181105_create_members.rb
#	deleted:    db/migrate/20140906181105_create_organization_users.rb
#	new file:   db/migrate/20140906182123_add_owner_references_to_accounts.rb
#	deleted:    db/migrate/20140906182123_add_owner_references_to_organizations.rb
#	new file:   db/migrate/20140920150318_add_reference_to_accounts.rb
#	modified:   db/schema.rb
#
# Changes not staged for commit:
#	modified:   app/views/dashboard/sales/revenues/index.html.erb
#	modified:   app/views/dashboard/shared/_nav_bar.html.erb
#
# Untracked files:
#	Gemfile.lock
#