resolving conflicts to push JS tweak
Merge branch 'master' into gh-pages