General Template
Merge branch 'master' of https://github.com/R-Knowsys/elasticray

Conflicts:
	webs/elastic-web/docroot/WEB-INF/liferay-plugin-package.properties