Merge into master from pull request #85:

...ain/java/net/floodlightcontroller/core/IOFController.java

...va/net/floodlightcontroller/core/internal/Controller.java

...n/java/net/floodlightcontroller/counter/CounterStore.java

src/main/java/net/floodlightcontroller/packet/Ethernet.java

...oodlightcontroller/staticflowentry/StaticFlowEntries.java

...floodlightcontroller/staticflowentry/StaticFlowTests.java