changed js
Merge branch 'master' of git://github.com/jdrunner/NILM-Manager
Merge branch 'master' of git://github.com/jdrunner/NILM-Manager
Merge branch 'master' of git://github.com/jdrunner/NILM-Manager
Merge branch 'master' of git://github.com/jdrunner/NILM-Manager
Merge branch 'master' of git://github.com/jdrunner/NILM-Manager
Merge branch 'master' of git://github.com/jdrunner/NILM-Manager
Merge branch 'master' of git://github.com/jdrunner/NILM-Manager
Merge branch 'master' of git://github.com/jdrunner/NILM-Manager
added live code