commit_normal
Merge branch 'master' of https://github.com/lvphu609/slickvn_integrate

Conflicts:
	application/models/common/common_apis.php
Merge branch 'master' of https://github.com/lvphu609/slickvn_integrate

Conflicts:
	application/models/common/common_apis.php