# Conflicts:
#	Configuration/PageTS/TCEFORM.tsconfig
#	Configuration/TCA/Overrides/tt_content_ce_CaseStudyLogo.php
#	Configuration/TCA/Overrides/tt_content_ce_TextWithTeaser.php
#	Configuration/TypoScript/Includes/Gridelements.typoscript