Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/fr/ntr/AccessPoint.java

src/main/java/fr/ntr/AccessPoint.java

@@ -88,4 +88,10 @@ public class AccessPoint {
         return this.timeSlotNb * this.subCarrierNb;
     }
 
+    public ResourceBlock[][] getFrame() {
+        return frame;
+    }
+    public void setFrame(ResourceBlock[][] frame) {
+        this.frame = frame;
+    }
 }