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

Conflicts:
	public/assets/gko-codemirror-all-43a3bde0a775b177bed1eb4b0cfe0bc7.js.gz

public/assets/gko-codemirror-all-d714c74ae4bbcfb17af32d8018e517cc.css.gz
	public/assets/gko-codemirror-all.css.gz
	public/assets/gko-codemirror-all.js.gz
	public/assets/gko/admin/admin-b0981e788118b38ee5b640406aed5e6a.js.gz
	public/assets/gko/admin/admin.js.gz

public/assets/gko/admin/tree-reorder-c687509a0a152604174f712a7ab5ddbe.js
.gz
	public/assets/gko/admin/tree-reorder.js.gz
	public/assets/gko_admin_all-af3390ae64c21400d3e787110c565e6b.css.gz
	public/assets/gko_admin_all-ee6839eb9ada748781101eb0527e208b.js.gz
	public/assets/gko_admin_all.css.gz
	public/assets/gko_admin_all.js.gz
	public/assets/gko_print-c58773c03ce8e881393dabc5b4dfb501.css.gz
	public/assets/gko_print.css.gz
	public/assets/gko_wym-1877dff16668ed55494e2750c5fada70.css.gz
	public/assets/gko_wym.css.gz
	public/assets/manifest.yml

public/assets/modernizr-2.6.2-respond-1.1.0.min-a30025e033895550a883e697
7ea7f332.js.gz
	public/assets/modernizr-2.6.2-respond-1.1.0.min.js.gz
	public/assets/public-b166d34afda3aac8b5e33574bd915e6e.css.gz
	public/assets/public-e960470850c71767dcc4744e4ef12daf.js.gz
	public/assets/public.css.gz
	public/assets/public.js.gz
	public/assets/wym_formatting-67e4f31187c4bd29d4bee86aa0ed0b6d.css.gz
	public/assets/wym_formatting.css.gz
	public/assets/wym_iframe-40a399dd6f9ec7c8a3caadf49948efe4.css.gz
	public/assets/wym_iframe.css.gz
	public/assets/wym_theme-57a8f3d595af36698b5d20651915fc8b.css.gz
	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-ca838c409f7853914fb6ecb05b25c164.
js.gz
	public/assets/wymeditor/skins/gko/skin.js.gz