add new js
add new controllers.js
Merge branch 'dev' of https://github.com/slydevis/NDI2014 into dev