tam commit
Merge branch 'master' of https://github.com/tamtranvn2012/baber

Conflicts:
	application/config/routes.php