updates
Merge branch 'master' of https://github.com/sfhatcompany/riverz-prestashop

Conflicts:
	config/xml/blog-en.xml