Merge branches 'master' and 'dev-local' into dev-local
Uncomment the overwriteFile in resource bundle
Merge pull request #126 from pentaho-tband/dev-local

Fix the overwriteFile flag in resource bundle