user messages and notifications
Merge branch 'master' of https://github.com/ITI-PHP-CI-2013/taximasr into HEAD

Conflicts:
	application/controllers/users.php
Merge branch 'master' of https://github.com/ITI-PHP-CI-2013/taximasr
user email and messages