Change config data for the demo
Merge branch 'develop' into gh-pages