commit
Merge branch 'master' of https://github.com/quocsonpham/develop

Conflicts:
	sites/all/modules/user_extend/user_extend.module
commit