deleting gemfile.lock
Merge branch 'develop' of https://github.com/openjaf/front-grocer into develop

Conflicts:
	Gemfile.lock
Merge branch 'develop' of https://github.com/openjaf/front-grocer into develop

Conflicts:
	Gemfile.lock
#
# 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 develop
# Your branch and 'origin/develop' have diverged,
# and have 1 and 30 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:
#	modified:   Gemfile
#	modified:   app/assets/javascripts/sequences.js
#	modified:   app/assets/stylesheets/sequences.css
#	deleted:    app/controllers/dashboard/base_controller.rb
#	modified:   app/controllers/dashboard/sales/adjustments_controller.rb
#	modified:   app/controllers/dashboard/sales/items_controller.rb
#	modified:   app/controllers/dashboard/sales/product_controller.rb
#	modified:   app/controllers/dashboard/sales/revenues_controller.rb
#	modified:   app/controllers/dashboard/sales/shipments_controller.rb
#	modified:   app/controllers/dashboard/sales/sources_controller.rb
#	modified:   app/controllers/dashboard/sales/taxes_controller.rb
#	modified:   app/controllers/dashboard/sales/transactions_controller.rb
#	modified:   app/models/order.rb
#	modified:   app/models/product.rb
#	modified:   app/views/dashboard/sales/product/_circle_chart.html.erb
#	new file:   app/views/dashboard/sales/product/_nav_bar_value_products.html.erb
#	modified:   app/views/dashboard/sales/product/by_categories.html.erb
#	new file:   app/views/dashboard/sales/product/by_value_brands.html.erb
#	new file:   app/views/dashboard/sales/product/by_value_categories.html.erb
#	new file:   app/views/dashboard/sales/revenues/by_hour.html.erb
#	modified:   app/views/dashboard/sales/revenues/by_sources.html.erb
#	modified:   app/views/dashboard/sales/revenues/by_status.html.erb
#	renamed:    app/views/dashboard/sales/revenues/by_hours.html.erb -> app/views/dashboard/sales/revenues/by_wday.html.erb
#	deleted:    app/views/dashboard/sales/revenues/by_week_days.html.erb
#	modified:   app/views/dashboard/sales/revenues/index.html.erb
#	new file:   app/views/dashboard/shared/_data_table.html.erb
#	modified:   app/views/dashboard/shared/_nav_bar_sales.html.erb
#	renamed:    app/views/dashboard/sales/revenues/_time_line_menu_options.html.erb -> app/views/dashboard/shared/_time_line_menu_options.html.erb
#	modified:   app/views/layouts/_dashboard_navigation_links.html.erb
#	renamed:    app/views/layouts/_company_navigation_links.html.erb -> app/views/layouts/_navigation_links.html.erb
#	modified:   app/views/layouts/_sidebar_links.html.erb
#	modified:   config/routes.rb
#	modified:   lib/dashboard/controller_helpers/by_amount.rb
#	modified:   lib/dashboard/controller_helpers/by_time.rb
#	modified:   lib/tasks/load_sample.rake
#
# Changes not staged for commit:
#	modified:   Gemfile
#	modified:   app/assets/javascripts/sequences.js
#	modified:   app/views/dashboard/sales/revenues/index.html.erb
#	modified:   app/views/dashboard/shared/_form_sales.html.erb
#	modified:   app/views/dashboard/shared/_nav_bar_sales.html.erb
#
# Untracked files:
#	Gemfile.lock
#	app/assets/javascripts/maps/france_departments.js
#	app/assets/javascripts/maps/usa_states.js
#	app/views/product/
#	public/assets/
#
modifiying sequences.js to show the product's name in the center of the chart
putting table in by_category