occ liem
Merge branch 'OCC-liemnh'

Conflicts:
	protected/controllers/ProductController.php
	protected/views/product/_form.php
Merge branch 'master' of https://github.com/bedonkey/occ