snapshot
Merge branch 'master' of https://github.com/codeocelot/config_manager
merge conflicts