payment log
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/modules/market/views/payment.php
	application/modules/register/views/reset_password.php
Merge branch 'master' of https://github.com/BeautyNista/nista