working on ControllerView.js
Standard merge.

Merge branch 'master' of https://github.com/Marist-OpenFlow/floodlight-dangerzone