Merge pull request #660 from rizard/master

.gitmodules

src/main/resources/web

src/main/resources/web/css/bootstrap.css

src/main/resources/web/css/styles.css

src/main/resources/web/img/floodlight.png

src/main/resources/web/img/glyphicons-halflings-white.png

src/main/resources/web/img/glyphicons-halflings.png

src/main/resources/web/img/logo.jpg

src/main/resources/web/img/openflow-logo-40px.png

src/main/resources/web/img/server.png

src/main/resources/web/img/switch.png

src/main/resources/web/index.html

src/main/resources/web/js/main.js

src/main/resources/web/js/models/flowmodel.js

src/main/resources/web/js/models/hostmodel.js

src/main/resources/web/js/models/portmodel.js

src/main/resources/web/js/models/statusmodel.js

src/main/resources/web/js/models/switchmodel.js

src/main/resources/web/js/models/topologymodel.js

src/main/resources/web/js/utils.js