language spellchecker added
fix gitignore conflict
Merge branch 'master' into develop