Merge branch 'roleRequest' into LearningSwitch0x04

Conflicts:
	setup.ml

Author: fugitifduck

_oasis

@@ -33,8 +33,6 @@ Library openflow
     Misc,
     VInt,
     ModComposition,
-    GroupTable0x04,
-    SDN_OpenFlow0x04,
     HighLevelSwitch_common    
   Modules:
     OpenFlow_Header,
@@ -44,6 +42,8 @@ Library openflow
     OpenFlow0x04,
     OpenFlow0x04_Core,
     SDN_OpenFlow0x01,
+    SDN_OpenFlow0x04,
+    GroupTable0x04,
     SDN_Types    
 
 Library async