Exclude conf.php file from git
fix some trad
Merge pull request #1181 from grandoc/3.3

fix some trad
Merge remote-tracking branch 'origin/3.3' into 3.4