Merge branch 'master' of https://github.com/CitadelOnTheMove/Citadel-Environmental-Template
Updated auto config