firefox fixes and better organized files for demo
Merge branch 'master' into gh-pages

* master:
  firefox fixes and better organized files for demo