Merge branch 'master' of https://github.com/photonstorm/phaser

Author: photonstorm

src/gameobjects/text/static/Text.js

@@ -486,6 +486,8 @@ var Text = new Class({
     {
         if (text === undefined) { text = this.text; }
 
+        this.style.syncFont(this.canvas, this.context);
+
         var wrappedLines = this.runWordWrap(text);
 
         return wrappedLines.split(this.splitRegExp);

src/loader/index.js

@@ -15,6 +15,7 @@ var Loader = {
 
     FileTypes: require('./filetypes'),
 
+    CONST: require('./const'),
     File: require('./File'),
     FileTypesManager: require('./FileTypesManager'),
     GetURL: require('./GetURL'),