push latest version: 2013.05.21 - version 1.0.8
Merge remote-tracking branch 'upstream/master'

Conflicts:
	css/layout.css
	functions/admin-functions.php
	includes/widgets/widget-woo-recent-products.php
	index.php
	style.css
	style.less