Fixed confused demo navigation
Merge branch 'master' into simplified