Reorder to put those with demos first
Merge branch 'master' into gh-pages

* master:
  Reorder to put those with demos first