updatign to r60
Merge branch 'master' into gh-pages
updating threejs on gh pages