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