# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch develop
# Your branch is behind 'origin/develop' by 34 commits, and can be fast-forwarded.
#   (use "git pull" to update your local branch)
#
# Changes not staged for commit:
#	modified:   Gemfile
#	modified:   Gemfile.lock
#	modified:   app/assets/javascripts/application.js
#	modified:   app/views/layouts/application.html.erb
#
# Untracked files:
#	app/assets/javascripts/maps/france_departments.js
#	app/assets/javascripts/maps/usa_states.js
#	app/views/product/
#	public/assets/application-2a5925bb84cdf022e36d25da5dd7239a.css
#	public/assets/application-2a5925bb84cdf022e36d25da5dd7239a.css.gz
#	public/assets/application-4a89d7ce0f50d634d1cfa982b13a0a59.js
#	public/assets/application-4a89d7ce0f50d634d1cfa982b13a0a59.js.gz
#	public/assets/bootstrap-colorpicker.min-f38b479e35a1e595dd49746e953d6982.js
#	public/assets/bootstrap-colorpicker.min-f38b479e35a1e595dd49746e953d6982.js.gz
#	public/assets/bootstrap-datepicker-81669d4f5299f7177143bf8253f13450.js
#	public/assets/bootstrap-datepicker-81669d4f5299f7177143bf8253f13450.js.gz
#	public/assets/bootstrap-multiselect-804b29de03db4f23b6545459bbd7fd91.js
#	public/assets/bootstrap-multiselect-804b29de03db4f23b6545459bbd7fd91.js.gz
#	public/assets/bootstrap-slider-c4d3d50e86dcc1df4cb2bda7023f3754.js
#	public/assets/bootstrap-slider-c4d3d50e86dcc1df4cb2bda7023f3754.js.gz
#	public/assets/bootstrap-switch.min-51743c2749d69486f2eb745ccba698fb.js
#	public/assets/bootstrap-switch.min-51743c2749d69486f2eb745ccba698fb.js.gz
#	public/assets/bootstrap-tagsinput.min-f88049385339672912c7fd18f1660e2d.js
#	public/assets/bootstrap-tagsinput.min-f88049385339672912c7fd18f1660e2d.js.gz
#	public/assets/bootstrap-tour.custom-93c43eef2684e8170673aa6cd00355e7.js
#	public/assets/bootstrap-tour.custom-93c43eef2684e8170673aa6cd00355e7.js.gz
#	public/assets/bootstrap.touchspin-394dceaebd625b0396487670fce3abc2.js
#	public/assets/bootstrap.touchspin-394dceaebd625b0396487670fce3abc2.js.gz
#	public/assets/daterangepicker-d116c28bc9055f3703a8061d43dc60d0.js
#	public/assets/daterangepicker-d116c28bc9055f3703a8061d43dc60d0.js.gz
#	public/assets/deliswitch-bbf7c429a5d697502820e35590c0b404.js
#	public/assets/deliswitch-bbf7c429a5d697502820e35590c0b404.js.gz
#	public/assets/fontawesome-webfont-0588f06ffc9215dfc3fd25641162ef98.ttf
#	public/assets/fontawesome-webfont-5041772f70aa5f46d3bc62918221a97d.svg
#	public/assets/fontawesome-webfont-7c6c78541b9baee6e897fc4de5d3fd78.woff
#	public/assets/fontawesome-webfont-e9f737c62716a8faef32ba0852854138.eot
#	public/assets/glyphicons-halflings-regular-04097583f3394813b9642cf91c9e019f.ttf
#	public/assets/glyphicons-halflings-regular-096f18b081b104fd70a613a5a85c3a6b.eot
#	public/assets/glyphicons-halflings-regular-d19ef1586b309e9bf50e04149ad740ee.svg
#	public/assets/glyphicons-halflings-regular-f32c7c112d6ae9aafd723c78dfe35bcf.woff
#	public/assets/jQAllRangeSliders-min-ea5024c79576a74c3a82043b6fb8b268.js
#	public/assets/jQAllRangeSliders-min-ea5024c79576a74c3a82043b6fb8b268.js.gz
#	public/assets/jquery-ui-1.10.4.custom.min-4ba1147ee9f6b686eaa5c3760b8f57aa.js
#	public/assets/jquery-ui-1.10.4.custom.min-4ba1147ee9f6b686eaa5c3760b8f57aa.js.gz
#	public/assets/jquery.masked-input.min-d1abe555fa388f390f5f30d7d4d91a24.js
#	public/assets/jquery.masked-input.min-d1abe555fa388f390f5f30d7d4d91a24.js.gz
#	public/assets/jquery.simplecolorpicker-7a96cadd9da6244ef0cef2924d8e9a7f.js
#	public/assets/jquery.simplecolorpicker-7a96cadd9da6244ef0cef2924d8e9a7f.js.gz
#	public/assets/king-common-e8931f19dcf201820afdc32dcf745526.js
#	public/assets/king-common-e8931f19dcf201820afdc32dcf745526.js.gz
#	public/assets/king-elements-1e5cd09af63595a727542dbf9763c568.js
#	public/assets/king-elements-1e5cd09af63595a727542dbf9763c568.js.gz
#	public/assets/lato-bol-webfont-400fd066a5ca1b07d2ca71b35245d6b9.woff
#	public/assets/lato-bol-webfont-5d0e8b70c53db022d07c9c0af4307630.svg
#	public/assets/lato-bol-webfont-78d75f17277c85b21ecb23afd20fe861.ttf
#	public/assets/lato-bol-webfont-adb47a39369439b8278882139b0f4cf4.eot
#	public/assets/lato-lig-webfont-325c9fd59e0a4f24fab6aa5c68328e48.eot
#	public/assets/lato-lig-webfont-3433309149d9d56442a231a9175e519e.woff
#	public/assets/lato-lig-webfont-a6858fbea5a248112f970cefa7ed875c.ttf
#	public/assets/lato-lig-webfont-a93363867def0f56ea606d4b344b8af2.svg
#	public/assets/lato-reg-webfont-0e40c2692a03adf6834f5930590a93d0.svg
#	public/assets/lato-reg-webfont-92c46d023f3e4961c9fc0b18bca72098.ttf
#	public/assets/lato-reg-webfont-c81e0f3c3c19feb77c2c63e24b618ffa.woff
#	public/assets/lato-reg-webfont-f15a2a55bb2657c149c552d8af4ae12b.eot
#	public/assets/main-3e864cf3c17087a2b4a3cb4929b5ebf6.css
#	public/assets/main-3e864cf3c17087a2b4a3cb4929b5ebf6.css.gz
#	public/assets/modernizr-6c8eaf3414780a89e6907a2b7a1ed2cf.js
#	public/assets/modernizr-6c8eaf3414780a89e6907a2b7a1ed2cf.js.gz
#	public/assets/moment.min-ba7169e33ea448b2cea58ff2d4cd122e.js
#	public/assets/moment.min-ba7169e33ea448b2cea58ff2d4cd122e.js.gz
#	public/assets/select2.min-dd2c4abbf994f851c8568a82289290d4.js
#	public/assets/select2.min-dd2c4abbf994f851c8568a82289290d4.js.gz
#
Merge branch 'develop' of https://github.com/openjaf/front-grocer into develop

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
Merge branch 'develop' of https://github.com/openjaf/front-grocer into develop

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch develop
# Your branch and 'origin/develop' have diverged,
# and have 1 and 34 different commits each, respectively.
#   (use "git pull" to merge the remote branch into yours)
#
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
#	deleted:    Gemfile.lock
#	deleted:    app/assets/fonts/fontawesome-webfont.eot
#	deleted:    app/assets/fonts/fontawesome-webfont.svg
#	deleted:    app/assets/fonts/fontawesome-webfont.ttf
#	deleted:    app/assets/fonts/fontawesome-webfont.woff
#	deleted:    app/assets/fonts/glyphicons-halflings-regular.eot
#	deleted:    app/assets/fonts/glyphicons-halflings-regular.svg
#	deleted:    app/assets/fonts/glyphicons-halflings-regular.ttf
#	deleted:    app/assets/fonts/glyphicons-halflings-regular.woff
#	deleted:    app/assets/fonts/lato-bol-webfont.eot
#	deleted:    app/assets/fonts/lato-bol-webfont.svg
#	deleted:    app/assets/fonts/lato-bol-webfont.ttf
#	deleted:    app/assets/fonts/lato-bol-webfont.woff
#	deleted:    app/assets/fonts/lato-lig-webfont.eot
#	deleted:    app/assets/fonts/lato-lig-webfont.svg
#	deleted:    app/assets/fonts/lato-lig-webfont.ttf
#	deleted:    app/assets/fonts/lato-lig-webfont.woff
#	deleted:    app/assets/fonts/lato-reg-webfont.eot
#	deleted:    app/assets/fonts/lato-reg-webfont.svg
#	deleted:    app/assets/fonts/lato-reg-webfont.ttf
#	deleted:    app/assets/fonts/lato-reg-webfont.woff
#	modified:   app/assets/javascripts/application.js
#	modified:   app/assets/javascripts/bootstrap-tagsinput.min.js
#	modified:   app/assets/javascripts/king-elements.js
#	modified:   app/assets/stylesheets/bootstrap.css
#	modified:   app/controllers/application_controller.rb
#	modified:   app/controllers/dashboard/sales/product_controller.rb
#	modified:   app/controllers/visitors_controller.rb
#	modified:   app/views/devise/registrations/edit.html.erb
#	modified:   app/views/devise/registrations/new.html.erb
#	modified:   app/views/devise/sessions/new.html.erb
#	modified:   app/views/layouts/_navigation.html.erb
#	modified:   app/views/layouts/_sidebar_links.html.erb
#	modified:   app/views/layouts/_sidebar_ref_links.html.erb
#	modified:   app/views/user_steps/organization_address.html.erb
#	modified:   app/views/visitors/index.html.erb
#	modified:   config/application.rb
#	modified:   config/environments/production.rb
#	modified:   config/initializers/devise.rb
#	modified:   lib/tasks/load_sample.rake
#	deleted:    public/assets/active_admin-3e3098c8a5e9a7f3b984ba95ac600637.css
#	deleted:    public/assets/active_admin-3e3098c8a5e9a7f3b984ba95ac600637.css.gz
#	deleted:    public/assets/active_admin-6da1ce1d0cf6f2f8747d8a20c238624c.js
#	deleted:    public/assets/active_admin-6da1ce1d0cf6f2f8747d8a20c238624c.js.gz
#	deleted:    public/assets/active_admin/admin_notes_icon-d0bc610adb67a87908bc3dfceae41af9.png
#	deleted:    public/assets/active_admin/application-ebc3eb96b8e779ee698e8fceda2427a5.js
#	deleted:    public/assets/active_admin/application-ebc3eb96b8e779ee698e8fceda2427a5.js.gz
#	deleted:    public/assets/active_admin/datepicker/datepicker-header-bg-6da3d255958609adee6d123ef790d75e.png
#	deleted:    public/assets/active_admin/datepicker/datepicker-input-icon-3e4043704fa0489aa3e6eccbbdc1790a.png
#	deleted:    public/assets/active_admin/datepicker/datepicker-next-link-icon-a53783601dbbc778db3ab8580df635ba.png
#	deleted:    public/assets/active_admin/datepicker/datepicker-nipple-770dbe500e8ce204f07fb236bf0ae329.png
#	deleted:    public/assets/active_admin/datepicker/datepicker-prev-link-icon-5d66c4f03b8690470dfc122eea67acc9.png
#	deleted:    public/assets/active_admin/index_list_icons/block_icon-7e4f3619af8b6a83eee81d6584a0bc73.svg
#	deleted:    public/assets/active_admin/index_list_icons/blog_icon-7ad75744df638e933ef384cde6b39200.svg
#	deleted:    public/assets/active_admin/index_list_icons/grid_icon-223b76a99d77f591a62f0bdb763ff1fc.svg
#	deleted:    public/assets/active_admin/index_list_icons/table_icon-018b2c3a2a9ad349d456525aa8295e1d.svg
#	deleted:    public/assets/active_admin/loading-d77f712cb5917faaf85fbffb2b843c85.gif
#	deleted:    public/assets/active_admin/nested_menu_arrow-f32ce529fe6ad40d338771146c169255.gif
#	deleted:    public/assets/active_admin/nested_menu_arrow_dark-aa78aeaddf8a11991646c7683b19cec6.gif
#	deleted:    public/assets/active_admin/orderable-a9e1bbe0b42c16041c0601c0929d3b2c.png
#	deleted:    public/assets/application-6d4aa6780c314e3d4d3f002b8a1afefe.css
#	deleted:    public/assets/application-6d4aa6780c314e3d4d3f002b8a1afefe.css.gz
#	deleted:    public/assets/application-7459c9e507b2279a0a0ade12aa460901.js
#	deleted:    public/assets/application-7459c9e507b2279a0a0ade12aa460901.js.gz
#	deleted:    public/assets/bootstrap-77a57f6adb1dc762d4074063fb320bab.js
#	deleted:    public/assets/bootstrap-77a57f6adb1dc762d4074063fb320bab.js.gz
#	deleted:    public/assets/bootstrap-9ea6874a168d98f51ea059e48537c92a.css
#	deleted:    public/assets/bootstrap-9ea6874a168d98f51ea059e48537c92a.css.gz
#	deleted:    public/assets/bootstrap-colorpicker/alpha-e997e613bdb4c892f1c048d1bb2522b3.png
#	deleted:    public/assets/bootstrap-colorpicker/alpha-horizontal-fa17affb0272f7ea085826f1cac0bba5.png
#	deleted:    public/assets/bootstrap-colorpicker/hue-67f4bccc97502fe012841bdee6a7cdd3.png
#	deleted:    public/assets/bootstrap-colorpicker/hue-horizontal-b3b16181f26736facbd36d40a0c10bc3.png
#	deleted:    public/assets/bootstrap-colorpicker/saturation-8a3cc482a86bcacded83bb7f076bce5d.png
#	deleted:    public/assets/chartkick-7665cab7898d4415c4045b388439cbeb.js
#	deleted:    public/assets/chartkick-7665cab7898d4415c4045b388439cbeb.js.gz
#	deleted:    public/assets/clear-4a20fbfadfa78b40497132766c5353c5.png
#	deleted:    public/assets/diagonal-stripe-10080e16c58ad7c0a28b276628470fa0.png
#	deleted:    public/assets/font-awesome-dc723e429e9481bd05471b6e44e91b07.css
#	deleted:    public/assets/font-awesome-dc723e429e9481bd05471b6e44e91b07.css.gz
#	deleted:    public/assets/gallery/bird-01caef278410cfeab3f6ee43d9925d67.jpg
#	deleted:    public/assets/gallery/cafe-c7638a23ced6b0d950902bd52549dfa3.jpg
#	deleted:    public/assets/gallery/chair-256ad79276dd66e261bef0d2c4775b9b.jpg
#	deleted:    public/assets/gallery/cuba-cup-d1805519ad2bcb625afbe0eabba9df3d.jpg
#	deleted:    public/assets/gallery/desk-06830a87de41b6fc6fc434ef23791ae7.jpg
#	deleted:    public/assets/gallery/desk2-324d1f4f9f93b0a96381fe03a0d83afe.jpg
#	deleted:    public/assets/gallery/fence-7a7140f8a7c2b3c0088e0aaa69ecff09.jpg
#	deleted:    public/assets/gallery/hand-091bb0018b0185998a5f1c8be4f7093d.jpg
#	deleted:    public/assets/gallery/jet-sky-2515d1571d05f2508a781d74e3f95a00.jpg
#	deleted:    public/assets/gallery/kitsune-17c7b2387e46b116fe0ec059fea61ffd.jpg
#	deleted:    public/assets/gallery/lighthouse-5b1fefbeb77efc2d0e47407883d42f48.jpg
#	deleted:    public/assets/gallery/mac-99b7b591666e95af88556b22c1086bb8.jpg
#	deleted:    public/assets/gritter-3df2f0ea54d8441bfb761a7d6d92f3bc.png
#	deleted:    public/assets/highcharts-434a58120f15685f0d4248f4d4dc7e8d.js
#	deleted:    public/assets/highcharts-434a58120f15685f0d4248f4d4dc7e8d.js.gz
#	deleted:    public/assets/ie-spacer-26cc87f54d285c5087c9b273df8e70b8.gif
#	deleted:    public/assets/king-chart-stat-baf37dffab0cf33d477f4a29bd4c7500.js
#	deleted:    public/assets/king-chart-stat-baf37dffab0cf33d477f4a29bd4c7500.js.gz
#	deleted:    public/assets/kingadmin-logo-e6c5fc8af7edf64ac9692d0bb0a149d8.png
#	deleted:    public/assets/kingadmin-logo-white-ecfead5c4d90f65726d2196422ced8a1.png
#	deleted:    public/assets/loading-234289d64bc690d3c414ae1f701759af.gif
#	deleted:    public/assets/main-dcb02d7a5f996ab252331f2892743326.css
#	deleted:    public/assets/main-dcb02d7a5f996ab252331f2892743326.css.gz
#	deleted:    public/assets/profile-avatar-cdcdad2c65ae295415c96423528efcff.png
#	deleted:    public/assets/select2-spinner-234289d64bc690d3c414ae1f701759af.gif
#	deleted:    public/assets/stat/colorbrewer-85a1aaf97249a2455912c55fdee8cd95.js
#	deleted:    public/assets/stat/colorbrewer-85a1aaf97249a2455912c55fdee8cd95.js.gz
#	deleted:    public/assets/stat/d3.min-9b3374b7670d4885a542a28a1488991a.js
#	deleted:    public/assets/stat/d3.min-9b3374b7670d4885a542a28a1488991a.js.gz
#	deleted:    public/assets/stat/data-barchart-a67938957798879b5218be7f7e7cf18d.tsv
#	deleted:    public/assets/stat/data-heatmap-a39b54567d123af5fcc68350259cb16b.tsv
#	deleted:    public/assets/user-avatar-5f3575f658a90c36192d86191633af84.png
#	deleted:    public/assets/user1-e9735110cc70adf0e87c8703d8c5a9d6.png
#	deleted:    public/assets/user2-c4112ff1fe75fc71bb5196a57e72e73c.png
#	deleted:    public/assets/user3-bf5632475c79e99dd2e847a134652bfd.png
#	deleted:    public/assets/user4-5fd338355939547ae7df444ecbf6af15.png
#	deleted:    public/assets/user5-3faf9fa88b248c6ff7cd417d67aa237f.png
#
# Untracked files:
#	app/assets/javascripts/maps/france_departments.js
#	app/assets/javascripts/maps/usa_states.js
#	app/views/product/
#	public/assets/
#
fixing bradcumbs and legend
modifiying sequences,js
fixing sequences.js
excluding activeadmin
fixing breadcrumbs
change gemfile
Merge branch 'develop' of github.com:openjaf/front-grocer into develop
hide in dashboard 'adjustments','taxes','shipments'