Signed-off-by: nhikieuod2012@gmail.com <nhikieuod2012@gmail.com>
Merge branch 'master' of https://github.com/tamtranvn2012/baber

Conflicts:
	application/views/registerbussiness.php
Signed-off-by: nhikieuod2012@gmail.com <nhikieuod2012@gmail.com>
Merge branch 'master' of https://github.com/tamtranvn2012/baber
Signed-off-by: nhikieuod2012@gmail.com <nhikieuod2012@gmail.com>
Merge branch 'master' of https://github.com/tamtranvn2012/baber

Conflicts:
	application/config/routes.php