java_gen: add support for object hashing via the guava hash API
Merge branch 'master' of github.com:floodlight/loxigen into funnel

Conflicts:
	java_gen/java_type.py
	java_gen/templates/of_factory_interface.java
add funnel support for new types
Merge branch 'master' into funnel

Conflicts:
	java_gen/java_type.py
	java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/U16.java
	java_gen/templates/of_factory_interface.java
Merge branch 'master' of github.com:floodlight/loxigen into funnel
Merge branch 'master' into funnel
Merge branch 'master' into funnel

Conflicts:
	java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/DatapathId.java
update version to 0.3.0 for funnel
Merge branch 'master' into funnel

Conflicts:
	java_gen/java_type.py
	java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/DatapathId.java
Merge branch 'master' of github.com:floodlight/loxigen into funnel

Conflicts:
	java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/DatapathId.java
Merge into master from pull request #94:
java_gen: add support for object hashing via the guava hash API (https://github.com/floodlight/loxigen/pull/94)