Merge branch 'master' into production

app/core/ModuleLoader.coffee

@@ -72,7 +72,7 @@ module.exports = ModuleLoader = class ModuleLoader extends CocoClass
       @trigger 'load-complete'
       
   parseDependencies: (raw) ->
-    bits = raw.match(/(require\(\'([^)]+)\')|(register\(\".+\")/g) or []
+    bits = raw.match(/(require\(['"](.+?)['"])|(register\(['"].+?['"])/g) or []
     rootFolder = null
     dependencies = []
     for bit in bits

app/views/editor/PatchesView.coffee

@@ -1,7 +1,7 @@
 CocoView = require 'views/core/CocoView'
 template = require 'templates/editor/patches'
 PatchesCollection = require 'collections/PatchesCollection'
-nameLoader = require 'lib/NameLoader'
+nameLoader = require 'core/NameLoader'
 PatchModal = require './PatchModal'
 
 module.exports = class PatchesView extends CocoView

app/views/modal/VersionsModal.coffee

@@ -2,7 +2,7 @@ ModalView = require 'views/core/ModalView'
 template = require 'templates/modal/versions'
 DeltaView = require 'views/editor/DeltaView'
 PatchModal = require 'views/editor/PatchModal'
-nameLoader = require 'lib/NameLoader'
+nameLoader = require 'core/NameLoader'
 CocoCollection = require 'collections/CocoCollection'
 deltasLib = require 'core/deltas'
 

config.coffee

@@ -174,6 +174,8 @@ exports.config =
         no_unnecessary_fat_arrows:
           level: 'ignore'
     uglify:
+      mangle:
+        except: ['require']
       output:
         semicolons: false
     sass: