Javascript tweaks
Merge branch 'master' of https://github.com/rmathew1992/final-sprint