Change config data for the demo
Clean shaders
Merge branch 'develop'