corrections after rebase

dream/simulation/CoreObject.py

@@ -344,7 +344,7 @@ class CoreObject(ManPyObject):
         giverObject=self.giver
         giverObject.sortEntities()                      #sort the Entities of the giver 
                                                         #according to the scheduling rule if applied
-        #giverObject.sortEntitiesForReceiver()
+        giverObject.sortEntitiesForReceiver(self)
         giverObjectQueue=giverObject.Res.users
         # if the giverObject is blocked then unBlock it
         if giverObject.exitIsAssignedTo():

dream/simulation/RandomNumberGenerator.py

@@ -30,7 +30,7 @@ import math
 
 class RandomNumberGenerator(object):
     def __init__(self, obj, distributionType, mean=0, stdev=0, min=0, max=0, alpha=0, beta=0,
-                 logmean=0,logsd=0, probability=0, shape=0, scale=0, location=0):
+                 logmean=0,logsd=0, probability=0, shape=0, scale=0, location=0, **kw):
         self.distributionType = distributionType
         self.mean = float(mean or 0)
         self.stdev = float(stdev or 0)