Merge branch 'master' of github.com:jmvh/liferay-tools
Merge branch 'master' of github.com:jmvh/liferay-tools