first upstream commit
Merge remote-tracking branch 'upstream/master'

Conflicts:
	changelog.txt
	css/layout.css
	css/layout.less
	css/woocommerce.css
	css/woocommerce.less
	custom.css
	footer.php
	functions.php
	functions/admin-functions.php
	functions/admin-init.php
	functions/functions-changelog.txt
	header.php
	includes/js/featured-slider.js
	includes/js/general.js
	includes/js/third-party.js
	includes/theme-actions.php
	includes/theme-functions.php
	includes/theme-js.php
	includes/theme-options.php
	includes/widgets/widget-woo-recent-products.php
	index.php
	style.css
	style.less
	template-contact.php