updated gitignore
Merge branch 'sf2.4'