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

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