Product controller and views update, category controller updatea, etc_controller update, models rename
Merge merge_controllers_views

Conflicts:
	public/js/custom/general.js