cart + report
payment edit
Merge branch 'master' of http://github.com/zentojamorn/kafra

Conflicts:
	application/libraries/payment.php
pao fix some bug
Merge branch 'master' of https://github.com/zentojamorn/kafra

Conflicts:
	application/controllers/cartlist.php
Merge branch 'master' of https://github.com/zentojamorn/kafra

Conflicts:
	application/controllers/cart.php
	application/libraries/payment.php
	application/views/header.php
Merge branch 'master' of https://github.com/zentojamorn/kafra
Merge branch 'master' of https://github.com/zentojamorn/kafra