Commit for page product detail
Merge branch 'local_occ'

Conflicts:
	protected/controllers/ProductController.php