ArticleUtilitTemplate improvements.
Article mgmt and Image mgmt ui improvements
Merge branch 'develop' of https://github.com/contento3/Projects into develop

Conflicts:
	core/src/main/java/screenToolbar.properties
	sites/src/com/contento3/thymeleaf/dialect/category/CategoryTemplateHelper.java