fix an issue in config/assets
update assets precompile
change manifies stylesheet
assets precompile
Merge branch 'master' of github.com:openjaf/front-grocer
add change dashboard navigation link
Merge pull request #24 from openjaf/merge_dashsboard

add change dashboard navigation link
change nav_bar to righ side
change assets and add datepicker to date options
Merge pull request #25 from openjaf/remote_active_admin

Remote active admin
add fonts
Merge pull request #26 from openjaf/remote_active_admin

add fonts
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