Working on modules section of controller
Getting Devin's changes

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

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