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

Conflicts:
	application/views/addindependentprofile.php
	application/views/adduserprofile.php
	application/views/postbi.php