MAJ
Merge branch 'master' of github.com:Gregcop1/typo3dummy

Conflicts:
	sav_typo3dummy.sql
	typo3conf/temp_CACHED_FE_psec1a_ext_localconf.php
	typo3conf/temp_CACHED_FE_psec1a_ext_tables.php
	typo3conf/temp_CACHED_psec1a_ext_localconf.php
	typo3conf/temp_CACHED_psec1a_ext_tables.php