update gemfile
Merge pull request #18 from openjaf/develop

Develop
update gems
improve sub nav bar
merge with master
Merge pull request #19 from openjaf/develop

improve sub nav bar
merge with develop
putting modals date pickers for custom date ranges
adding bootstrap-datepicker-rails
Merge branch 'develop' of https://github.com/openjaf/front-grocer into loading_groceries

Conflicts:
	Gemfile.lock
	app/assets/stylesheets/active_admin.css.scss
	app/views/dashboard/shared/_nav_bar.html.erb