mod to .gitignore and partial DictGenerator
Merging trainEngine.xml