Update .gitignore and instance.cfg
Update .gitignore
Merge remote-tracking branch 'origin/dev'
Update instance.cfg