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

Conflicts:
	.htaccess
Merge branch 'master' of https://github.com/ITI-PHP-CI-2013/taximasr

Conflicts:
	.htaccess
	application/controllers/users.php
add view files
Merge branch 'master' of https://github.com/ITI-PHP-CI-2013/taximasr