WCM-11 Bugfix in include request
WCM-11 An OSGi compatible Freemarker Servlet
WCM-11 Update portlet to use the correct Servlet

Conflicts:
	portlets/content-targeting-portlet/bnd.bnd
	portlets/content-targeting-portlet/docroot/WEB-INF/web.xml
WCM-11 IntelliJ configuration for new module
WCM-11 SF
WCM-11 document the new plugin in the deploy process