Migration to 6.2: configurations adapted
Merge branch 'master' of https://github.com/PolitAktiv/politaktiv-aktuelles-meinungsbild-portlet

Conflicts:
	.classpath
	docroot/WEB-INF/classes/META-INF/portlet-spring.xml
	docroot/WEB-INF/src/META-INF/portlet-spring.xml