release
Merge remote-tracking branch 'origin/HEAD'

Conflicts:
	docroot/WEB-INF/liferay-plugin-package.properties
	releases.txt