changed order of sigtype and sigid

Conflicts:
	java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchField.java
	java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchFields.java
	java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/CircuitSignalID.java