Merge pull request #1 from exoplatform/master

update