Using JDOM 2
Merge branch 'BRANCH_PLATFORM_5' of https://github.com/idega/com.idega.content into BRANCH_PLATFORM_5