Merge branch 'develop' into develop_nutty_modify_framework_addnewreader

CHANGELOG

@@ -16,6 +16,7 @@ cocos2d-x-3.0beta0 ?? 2013
      [FIX]          Deprecates FileUtils::getFileData, adds FileUtils::getStringFromFile/getDataFromFile.
      [FIX]          GUI refactoring: Removes UI prefix, Widget is inherited from Node, uses new containers(Vector<T>, Map<K,V>).
      [FIX]          String itself is also modified in `String::componentsSeparatedByString`.
+     [FIX]          Sprites with PhysicsBody move to a wrong position when game resume from background.
 [Android]
      [NEW]          build/android-build.sh: add supporting to generate .apk file
      [FIX]          XMLHttpRequest receives wrong binary array.

cocos/2d/CCDirector.cpp

@@ -847,13 +847,10 @@ void Director::resume()
 
     setAnimationInterval(_oldAnimationInterval);
 
-    if (gettimeofday(_lastUpdate, nullptr) != 0)
-    {
-        CCLOG("cocos2d: Director: Error in gettimeofday");
-    }
-
     _paused = false;
     _deltaTime = 0;
+    // fix issue #3509, skip one fps to avoid incorrect time calculation.
+    setNextDeltaTimeZero(true);
 }
 
 // display the FPS using a LabelAtlas

cocos/base/CCMap.h

@@ -107,10 +107,22 @@ public:
         _data.reserve(capacity);
     }
     
-    /** Returns capacity of the map */
-    ssize_t capacity() const
+    /** Returns the number of buckets in the Map container. */
+    ssize_t bucketCount() const
     {
-        return _data.capacity();
+        return _data.bucket_count();
+    }
+    
+    /** Returns the number of elements in bucket n. */
+    ssize_t bucketSize(ssize_t n) const
+    {
+        return _data.bucket_size(n);
+    }
+    
+    /** Returns the bucket number where the element with key k is located. */
+    ssize_t bucket(const K& k) const
+    {
+        return _data.bucket(k);
     }
     
     /** The number of elements in the map. */