needs to be check again
Merge origin/master

Conflicts:
	View/productDesc.php