first commit for review
fix conflict
Merge branch 'master' of https://github.com/tungmv/GXC-SOCIAL

Conflicts:
	apps/common/components/Helper.php
	apps/common/globals.php
	apps/web/config/environment.php