avior.js appears to be solid, working on controllerview.js
Standard merge.

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