Fluid-Template and base TypoScript
Merge branch 'master' of https://github.com/typo3-themes/themes_gridelements

Conflicts:
	ext_tables.php