font internet
Merge branch 'fixing_groceries' of https://github.com/openjaf/front-grocer into loading_groceries

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/layouts/_dashboard_navigation_links.html.erb
	app/views/layouts/application.html.erb
	lib/dashboard/controller_helpers/by_time.rb
fixing by time helper
fixing date Options
putting filter in time line
putting details in filters
change not commited
merge
Merge pull request #27 from openjaf/loading_development

Loading development