adding taxons and taxonomies
adding dashboard's views
adding load_sample task
adding controllers helpers
adding migrates
adding ffaker gem and testing migrates
putting dashboard code
adding controllers of dashboard
adding product modifications
modifying the application.js to include chartkick.js
adding classification
trying to run sample_load rake task
givet format to layout
improve format
Merge pull request #1 from openjaf/loading_project

Loading project
add user name for drop_down
Merge branch 'develop' of github.com:openjaf/grocer into develop
format inline submenu in time_line
fixed navigation and navigation_link
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
putting products charts and fixing revenues charts in mozilla