Fix lots of things.
Merge branch 'master' of https://github.com/zentojamorn/kafra

Conflicts:
	application/controllers/productManage.php