updates
merge
updates
Merge branch 'master' of github.com:Xaar/wplearn

Conflicts:
	wp-content/themes/iml/page_homepage.php
	wp-content/themes/iml/single-products.php