payment
Merge branch 'master' of https://github.com/BeautyNista/nista

Conflicts:
	application/modules/admin/controllers/shippings.php
	application/modules/admin/views/shipping/index.php