project updates, js logic changed
Merge branch 'master' into gh-pages