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

Conflicts:
	src/main/resources/avior/test/js/router/router.js
merging changes
Merge branch 'master' of https://github.com/Marist-OpenFlow/floodlight-dangerzone

Conflicts:
	src/main/resources/avior/test/tpl/flowEd.html