Using constant
Merge branch 'master' of https://github.com/idega/com.idega.content into BRANCH_PLATFORM_5

Conflicts:
	.gitignore
	src/java/com/idega/content/themes/helpers/business/ColourExpressionCalculator.java
	src/java/com/idega/content/tree/SiteTemplatesViewer.java