Merge pull request #17 from OPENNETWORKINGLAB/ONOS-Next

Merge ONOS-Next branch into master