update
Merge branch 'master' of https://github.com/iyottt/nbtc

Conflicts:
	application/models/user.php