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)