main version
Merge branch 'master' of https://github.com/mohi86/shop-box

Conflicts:
	components/com_jblance/models/project.php
	components/com_jblance/views/project/tmpl/showmywishlist.php