Big re-converge
Merge branch 'master' of https://github.com/midlantica/valentina-website

Conflicts:
	Gemfile
	Gemfile.lock
	config.rb
	locales/es.yml
	source/config.rb
	source/css/styles.css
	source/index.html.erb
	source/layouts/layout.erb
	source/localizable/artist_statement.html.erb
	source/localizable/digital_artwork.html.erb
	source/localizable/gallery.html.erb
	source/localizable/index.html.erb
	source/localizable/original_artwork.html.erb
	source/localizable/patterns.html.erb
	source/localizable/shop.html.erb
	source/sass/_base.scss
	source/sass/styles.scss