Merge branch 'develop'
Merge branch 'master' of https://github.com/EdenServers/EdenManager
Merge branch 'develop'
Merge branch 'develop'
add config.yml to gitignore
Merge branch 'master' into develop