Full modification for new configurations
Merge branch 'master' of https://github.com/magnolini/Excitement-Open-Platform
switched the files