Indent fix
Merge remote-tracking branch 'clcho/mybranch' into flowmod

Conflicts:
	core/config.json
Merge remote-tracking branch 'clcho/mybranch' into flowmod
Modify README.md
Fix README
Merge remote-tracking branch 'clcho/mybranch' into flowmod
Merge remote-tracking branch 'clcho/mybranch' into flowmod
Merge remote-tracking branch 'clcho/mybranch' into flowmod
Merge remote-tracking branch 'clcho/mybranch' into flowmod
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
Flowmod UI, need to be tested

- Add flow
- Mod flows
- Del flows
- Mod specific flow
- Del specific flow
update