Merge remote-tracking branches 'upstream/dev' and 'origin/dev' into dev
Allow CORS from http://localhost
Merge remote-tracking branches 'upstream/dev' and 'origin/dev'
1. add priority field for every flow
2. fix the mistake for byteCount and packetCount
Merge pull request #16 from hwchiu/floodlight-adapter

add priority field for every flow. fix bug
Add tos-bits field for every flow
Merge pull request #17 from starbops/dev

Add tos-bits field for every flow