adding controllers of dashboard
adding product modifications
modifying the application.js to include chartkick.js
adding classification
trying to run sample_load rake task
last changes
Merge branch 'loading_project' of https://github.com/openjaf/grocer into loading_project

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/dashboard/sales/product_controller.rb
	app/models/order.rb
	app/views/layouts/_sidebar_links.html.erb
	app/views/layouts/application.html.erb
	lib/dashboard/controller_helpers/by_time.rb
fixing charts with chartkick.js