Merge branch 'dev', remote-tracking branch 'upstream/dev' into dev
Add the duration field for stat-core
Merge pull request #22 from hwchiu/floodlight-adapter

Floodlight adapter