Merge branch 'master' of https://github.com/omarnetfr/liferay.git