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

Conflicts:
	application/controllers/profilepage.php
	application/models/profile_model.php
	application/views/editbussiness.php