bump
Merge branch 'master' of https://github.com/jdfdesign/gko_welcome_car_rental_st_barth_com

Conflicts:
	Gemfile.lock
	public/assets/gko-codemirror-all-2ada0d11c8900e6ccf47f01001a0c8b8.css
	public/assets/gko-codemirror-all-5e68b53d831ebd367b6e97c35b10e380.css
	public/assets/gko-codemirror-all-63c99872bcc1f5a81fee433c553e68ea.js.gz
	public/assets/gko-codemirror-all-edb575ad97e2f0d0999a5233a58ec96a.css
	public/assets/gko-codemirror-all.css
	public/assets/gko-codemirror-all.css.gz
	public/assets/gko-codemirror-all.js.gz
	public/assets/gko/admin/admin-a51753378f6fc9ef3289caaa210e194b.js.gz
	public/assets/gko/admin/admin.js.gz

public/assets/gko/admin/tree-reorder-1e8bf21b5c781d88bbacab438de09ffe.js
.gz
	public/assets/gko/admin/tree-reorder.js.gz
	public/assets/gko_admin_all-2e6ec84563d1cfa582fe186fee38b6f6.css
	public/assets/gko_admin_all-2e6ec84563d1cfa582fe186fee38b6f6.css.gz
	public/assets/gko_admin_all-5b89b8eb207c4323aafdd0818932d2bd.js.gz
	public/assets/gko_admin_all-5ccef04d60d73229cbd2e2ddc5b52f33.css
	public/assets/gko_admin_all-b33655c7a624cbbeb6587046f7f26829.css
	public/assets/gko_admin_all.css
	public/assets/gko_admin_all.css.gz
	public/assets/gko_admin_all.js.gz
	public/assets/gko_print-4a5335c6773c1b5e52f7fc37cc355cfe.css
	public/assets/gko_print-556fb9e081ab4801938aa93d67c34d0a.css
	public/assets/gko_print-556fb9e081ab4801938aa93d67c34d0a.css.gz
	public/assets/gko_print-7b47652a854553b29f5d8afab7cd1b5e.css
	public/assets/gko_print.css
	public/assets/gko_print.css.gz
	public/assets/gko_wym-966d71bedc0b3abf691688e27ad00c0c.css
	public/assets/gko_wym-dbb9086a6fda19d06ed580baacad10e0.css
	public/assets/gko_wym-f87915db8aa5b7e413e0ed99eb707749.css
	public/assets/gko_wym.css
	public/assets/gko_wym.css.gz
	public/assets/manifest.yml
	public/assets/public-0eaa67aa7c1f5525fa132ca0af0c15ac.css.gz
	public/assets/public-b17a7e56c4636a8212cd06e2d90e1d57.js.gz
	public/assets/public.css.gz
	public/assets/public.js.gz
	public/assets/wym_formatting-1406d03b19c50f4003fe72354f276bd1.css
	public/assets/wym_formatting-3c74734a14749c7fcd735ab63fbea224.css
	public/assets/wym_formatting-3c74734a14749c7fcd735ab63fbea224.css.gz
	public/assets/wym_formatting-97a42a296736afeba0b1f9f2bd0bc33a.css
	public/assets/wym_formatting.css
	public/assets/wym_formatting.css.gz
	public/assets/wym_iframe-8753bd7888017fcc63f2dbc936cac6ee.css
	public/assets/wym_iframe-8753bd7888017fcc63f2dbc936cac6ee.css.gz
	public/assets/wym_iframe-bd767df3e625ee56b4d30fd0476553e6.css
	public/assets/wym_iframe-e828ff9dca4c53b7473c1e846a9faf15.css
	public/assets/wym_iframe.css
	public/assets/wym_iframe.css.gz
	public/assets/wym_theme-2e83fe713ad9bdc79f05d985b3c67bef.css
	public/assets/wym_theme-5ff348e228cbc569d79d2aa1180d5b85.css
	public/assets/wym_theme-80153d08d7d371b3af5b0ad4dd40bd2d.css
	public/assets/wym_theme.css
	public/assets/wym_theme.css.gz
	public/assets/wymeditor/lang/en-ee70193660fa2375497384ad2419b280.js.gz
	public/assets/wymeditor/lang/en.js.gz
	public/assets/wymeditor/lang/fr-026110df2f94229e36309e7b1a87155c.js.gz
	public/assets/wymeditor/lang/fr.js.gz

public/assets/wymeditor/skins/gko/skin-09aae0392b172ba452878c94137c1f65.
js.gz
	public/assets/wymeditor/skins/gko/skin.js.gz