Merge remote-tracking branch 'origin/master'

Conflicts:
	app/CpzModule/presenters/CalendarPresenter.php
	app/CpzModule/templates/Calendar/default.latte
	app/CpzModule/templates/Catalog/default.latte
	app/CpzModule/templates/Homepage/default.latte
Merge remote-tracking branch 'origin/master'