Follow Java guidelines for field modifier ordering
Fixed typo: IP->Mac
Merge branch 'master' of github.com:floodlight/loxigen
Added methods to DatapathId to get/set by byte array
Make enabled field of packet in suppression request a boolean
locitest: add module magic string to makefile
Merge into master from pull request #95:
Get/set DatapathId by byte array and a few other miscellaneous fixes (https://github.com/floodlight/loxigen/pull/95)
Merge into master from pull request #96:
locitest: add module magic string to makefile (https://github.com/floodlight/loxigen/pull/96)
openflow_input: fix role_request/reply

Lists the role as enum ofp_controller role
Changes the body of the reply to match the body of the request as per spec
java_gen: add OFGroup
openflow_input: make stats_request/reply flags use enum
Merge branch 'master' into funnel

Conflicts:
	java_gen/java_type.py
	java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/DatapathId.java