Merge branch 'master' of https://github.com/jdfdesign/gko_villa-lps-stbarth_com

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/fonts/twitter/glyphicons-halflings-regular.eot
	app/assets/fonts/twitter/glyphicons-halflings-regular.svg
	app/assets/fonts/twitter/glyphicons-halflings-regular.ttf
	app/assets/fonts/twitter/glyphicons-halflings-regular.woff
	app/assets/javascripts/public.js
	app/assets/stylesheets/_variables.scss
	app/assets/stylesheets/public.css.scss
	app/views/pages/_contact.html.erb
	app/views/pages/show.html.erb
	db/schema.rb
	public/assets/gko-codemirror-all-733a0c48cd2d30c93b114167d7e96aad.js
	public/assets/gko-codemirror-all-f1ab4383eaa003b4bd8a93cdc594e6c7.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-a51753378f6fc9ef3289caaa210e194b.js.gz
	public/assets/gko/admin/admin.js.gz

public/assets/gko/admin/tree-reorder-f835777b39bddeaa26727f67f1741194.js
	public/assets/gko/admin/tree-reorder.js
	public/assets/gko/admin/tree-reorder.js.gz
	public/assets/gko_admin_all-39c96be2aa95b60643659eaf9e4f97e2.js
	public/assets/gko_admin_all-ed9313f8910d46241b07ff2442fcc0de.css
	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-7b303fdb7f250c803b554e68c3345ecf.css
	public/assets/gko_print.css
	public/assets/gko_print.css.gz
	public/assets/gko_wym-e2e1bbcf1dc6d30b94f52e4c2301700f.css
	public/assets/gko_wym.css
	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-bcbc311b8cf17ab0ab4c7a054e883939.js
	public/assets/public.css
	public/assets/public.css.gz
	public/assets/public.js
	public/assets/public.js.gz
	public/assets/wym_formatting-5ecfe1d8c2c8d7c5d00b9ebf562272fa.css
	public/assets/wym_formatting.css
	public/assets/wym_formatting.css.gz
	public/assets/wym_iframe-0ae59f9c9fcb8dd1e452a4ea8fb0211c.css
	public/assets/wym_iframe-0ae59f9c9fcb8dd1e452a4ea8fb0211c.css.gz
	public/assets/wym_iframe.css
	public/assets/wym_iframe.css.gz
	public/assets/wym_theme-a35ee3c88b6dfc349f4a647abf75e4dd.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
Merge branch 'master' of https://github.com/jdfdesign/gko_villa-lps-stbarth_com

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/public.js
	app/assets/stylesheets/_variables.scss
	app/assets/stylesheets/public.css.scss
	app/views/pages/_contact.html.erb
	app/views/pages/show.html.erb
	db/schema.rb
	public/assets/gko-codemirror-all-733a0c48cd2d30c93b114167d7e96aad.js
	public/assets/gko-codemirror-all-f1ab4383eaa003b4bd8a93cdc594e6c7.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-a51753378f6fc9ef3289caaa210e194b.js.gz
	public/assets/gko/admin/admin.js.gz

public/assets/gko/admin/tree-reorder-f835777b39bddeaa26727f67f1741194.js
	public/assets/gko/admin/tree-reorder.js
	public/assets/gko/admin/tree-reorder.js.gz
	public/assets/gko_admin_all-39c96be2aa95b60643659eaf9e4f97e2.js
	public/assets/gko_admin_all-ed9313f8910d46241b07ff2442fcc0de.css
	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-7b303fdb7f250c803b554e68c3345ecf.css
	public/assets/gko_print.css
	public/assets/gko_print.css.gz
	public/assets/gko_wym-e2e1bbcf1dc6d30b94f52e4c2301700f.css
	public/assets/gko_wym.css
	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-bcbc311b8cf17ab0ab4c7a054e883939.js
	public/assets/public.css
	public/assets/public.css.gz
	public/assets/public.js
	public/assets/public.js.gz
	public/assets/wym_formatting-5ecfe1d8c2c8d7c5d00b9ebf562272fa.css
	public/assets/wym_formatting.css
	public/assets/wym_formatting.css.gz
	public/assets/wym_iframe-0ae59f9c9fcb8dd1e452a4ea8fb0211c.css
	public/assets/wym_iframe-0ae59f9c9fcb8dd1e452a4ea8fb0211c.css.gz
	public/assets/wym_iframe.css
	public/assets/wym_iframe.css.gz
	public/assets/wym_theme-a35ee3c88b6dfc349f4a647abf75e4dd.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