LOXI-45 Create common base interface for IPv[46]Address and IPv[46]Address with Mask
Merge branch 'master' of github.com:floodlight/loxigen

Conflicts:
	java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/Prerequisite.java
Moved IPVersion enum to top level
Merge into master from pull request #74:
LOXI-45 Create common base interface for IPv[46]Address and IPv[46]Address with Mask (https://github.com/floodlight/loxigen/pull/74)
Make OFStatsRequest parameterized with the StatsReply
OFPort: remove wrong NONE=0 constant
Introduce TableId value type
java_gen: make OFFactory be a XidGenerator
Update openflow connection port to 6653 [PAN-367]
java_gen: made OFValueTypes Comparable
Merge into master from pull request #75:
Various improvements for vft-demo (https://github.com/floodlight/loxigen/pull/75)
Merge into master from pull request #76:
Update openflow connection port to 6653 [PAN-367] (https://github.com/floodlight/loxigen/pull/76)
Merge pull request #3 from yotamhc/in_ports_masked2

In ports masked updates
Merge remote-tracking branch 'origin/master' into in_ports_masked2

Conflicts:
	java_gen/java_type.py
Fixes to port map