CPZ FINAL + KPZ intro
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/CpzModule/templates/Calendar/default.latte
	app/components/Product/ProductVoteControl.latte
	app/router/KpzRouterFactory.php