Changes to code and javascript disabled--functionality implemented
Changes to code and javascript disabled--functionality implemented - edit
Merge branch 'master' into gh-pages
updating live