Auto config
Merge branch 'develop'
Merge branch 'master' of https://github.com/CitadelOnTheMove/Citadel-Events-Template.git