sync with master
sync with master
added css and js includes that where removed during the sync operation
webgl demo js
removed fixed positions