Update config files
Merge branch 'release/1.0.1'
Update and ignore config file
Merge branch 'hotfix/1.0.2' into develop