remove config from versioncontrol
bump
Merge branch 'master' into develop