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

Conflicts:
	.idea/workspace.xml
	application/models/profile_model.php