ArticleProcessor.java addition
Merge branch 'develop' of https://github.com/contento3/Projects into develop

Conflicts:
	cmsadmin/.settings/com.vaadin.integration.eclipse.prefs
	cmsadmin/WebContent/VAADIN/widgetsets/com.contento3.web.widgetset.CmsadminWidgetset/com.contento3.web.widgetset.CmsadminWidgetset.nocache.js
	cmsadmin/WebContent/VAADIN/widgetsets/com.contento3.web.widgetset.CmsadminWidgetset/compilation-mappings.txt
	cmsadmin/WebContent/jsp/codemirror.html
	sites/src/com/contento3/site/controller/PageController.java
	sites/src/com/contento3/site/template/loader/impl/TemplateLoaderImpl.java
Commit includes resolving issues with the merge