...
Merge branch 'master' of https://github.com/FHNW/plonetheme.codapress

Conflicts:
	plonetheme/codapress/static/index.html
	plonetheme/codapress/static/rules.xml
Merge branch 'master' of https://github.com/FHNW/plonetheme.codapress