Liferay6

I created this merge request to review the changes needed to make EvalS work in liferay6 based Luminis. I will actually keep this branch open to do any bug fixes on the liferay 6 version that don't apply to develop