Better merging of TypoScript and FlexForm

git-svn-id: https://svn.typo3.org/TYPO3v4/Extensions/camaliga/trunk@83440 735d13b6-9817-0410-8766-e36946ffe9aa