Merge branch 'master' of https://github.com/CitadelOnTheMove/Citadel-Crowd-sourcing-Template
Auto config
Merge branch 'develop'
Use only relative includes (allows auto config)