Merge remote-tracking branch 'upstream/master' into testing

Conflicts:
	functions.php
	header.php
	style.css
	style.less
fix merge functions.php
Merge branch 'testing' of https://github.com/sw33tr/plasenet_woo_superstore into testing
fix templ overrides
mod pretty add data-rel
contact spatiu mai jos
fix spatiu intre harta si footer
add best sellers ro translation
mod cod postal not required
make state (judet) required
nu merge judet required
rel="nofollow" tel, fb, tw, g+
Campuri regcom, banca email
Merge remote-tracking branch 'upstream/master' into testing

Conflicts:
	includes/js/third-party.js
	style.css
	style.less
fix social footer icon size
fix google plus icon size footer
fix icons footer width 1.5em
Merge branch 'testing'

Conflicts:
	functions.php
	header.php
	style.css
	style.less
Delete old checkout files