update
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/modules/admin/models/discount_model.php
Merge branch 'master' of https://github.com/BeautyNista/nista