Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into issue2261_LoaderBug

Author: ShengxiangChen

cocos2d/core/platform/CCFileUtils.js

@@ -423,6 +423,10 @@ cc.FileUtils = cc.Class.extend({
      * @return {String} full path for a given filename.
      */
     fullPathForFilename:function (filename) {
+        if (filename.indexOf("://") > 0) {
+            return filename;
+        }
+
         var found = false;
 
         var newFileName = this._getNewFilename(filename);

extensions/CocoStudio/GUI/Layouts/UILayoutDefine.js

@@ -76,7 +76,7 @@ ccs.Margin = ccs.Class.extend(/** @lends ccs.Margin# */{
     right: 0,
     bottom: 0,
     ctor: function (margin, top, right, bottom) {
-        if (top === undefined) {
+        if (margin && top === undefined) {
             this.left = margin.left;
             this.top = margin.top;
             this.right = margin.right;