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

Conflicts:
	Gemfile.lock
	public/assets/gko-codemirror-all-bfd7dc778c4625ce6ad4ef677050c1c8.js
	public/assets/gko-codemirror-all-eab0874457874021f47f18d510122274.css
	public/assets/gko-codemirror-all.css
	public/assets/gko-codemirror-all.css.gz
	public/assets/gko-codemirror-all.js
	public/assets/gko-codemirror-all.js.gz
	public/assets/gko/admin/admin-56843bf1743c609ccb07c30baba8a4e5.js.gz
	public/assets/gko/admin/admin.js.gz
	public/assets/gko/admin/tree-reorder.js
	public/assets/gko/admin/tree-reorder.js.gz
	public/assets/gko_admin_all-35b87f168268cc1eb10095378be81ec5.js
	public/assets/gko_admin_all-428470e800fa27dee11d1416631235c9.css
	public/assets/gko_admin_all-428470e800fa27dee11d1416631235c9.css.gz
	public/assets/gko_admin_all.css
	public/assets/gko_admin_all.css.gz
	public/assets/gko_admin_all.js
	public/assets/gko_admin_all.js.gz
	public/assets/gko_print-04d4e3e5b0372c33d7d9edae97c4da3f.css
	public/assets/gko_print.css
	public/assets/gko_print.css.gz
	public/assets/gko_wym-0392b77a198551e906df8054e7cfee3a.css
	public/assets/gko_wym.css
	public/assets/gko_wym.css.gz
	public/assets/manifest.yml
	public/assets/public-07005918940abf30ab85861b4da6f638.js
	public/assets/public-37176c7bbde3f8314c201fcbc6ec3dc9.css
	public/assets/public-37176c7bbde3f8314c201fcbc6ec3dc9.css.gz
	public/assets/public.css
	public/assets/public.css.gz
	public/assets/public.js
	public/assets/public.js.gz
	public/assets/wym_formatting-deef613961c2415d018c770f4e0fd987.css
	public/assets/wym_formatting.css
	public/assets/wym_formatting.css.gz
	public/assets/wym_iframe-59d99a246760b00ed9cb462ff6e7c7df.css
	public/assets/wym_iframe-59d99a246760b00ed9cb462ff6e7c7df.css.gz
	public/assets/wym_iframe.css
	public/assets/wym_iframe.css.gz
	public/assets/wym_theme-8f8a1070d83081fb93cbcbec0cc24c1d.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