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

Conflicts:
	application/views/addprofile.php
	application/views/include/menu.php
	application/views/profilemanage.php