updating users controller
Merge branch 'master' of https://github.com/ITI-PHP-CI-2013/taximasr

Conflicts:
	application/controllers/users.php
updating users controller