correct various typo and add IDE project config to gitignore
Merge remote-tracking branch 'upstream/master'