js changes
Merge branch 'master' of github.com:tylshe/master-up-wrt