Added .gitignore to .gitignore
Merge remote-tracking branch 'origin/master'
Updated contrib modules and core to latest