Merge branch 'pr/2331' into dev

# Conflicts:
#	README.md

Author: photonstorm

Gruntfile.js

@@ -400,6 +400,7 @@ module.exports = function (grunt) {
         grunt.task.run('arcadephysics');
         grunt.task.run('nophysics');
         grunt.task.run('minimum');
+        grunt.task.run('split');
 
     });
 
@@ -443,9 +444,10 @@ module.exports = function (grunt) {
     grunt.registerTask('split', 'Compile Phaser to dist folder and splits the globals into single files', function() {
 
         grunt.option('exclude', 'ninja,creature');
-        grunt.option('filename', 'phaser');
+        grunt.option('filename', 'phaser-split');
         grunt.option('sourcemap', true);
         grunt.option('copy', false);
+        grunt.option('copycustom', true);
         grunt.option('uglify', true);
         grunt.option('split', true);
 

README.md

@@ -183,6 +183,46 @@ As a result of this work the minimum build size of Phaser is now just 80KB minif
 
 See the [Creating a Custom Phaser Build](http://phaser.io/tutorials/creating-custom-phaser-builds) tutorial for details.
 
+### Webpack
+
+Starting from Phaser 2.4.5 we now include a custom build for Webpack.
+
+You need to add `p2` as a dependency.
+
+###### Webpack config
+```
+var path = require('path');
+var webpack = require('webpack');
+
+var phaserModule = path.join(__dirname, '/node_modules/phaser/');
+var phaser = path.join(phaserModule, 'build/custom/phaser-split.js'),
+  pixi = path.join(phaserModule, 'build/custom/pixi.js'),
+  p2 = path.join(phaserModule, 'build/custom/p2.js');
+
+module.exports = {
+    ...
+    module: {
+        loaders: [
+            { test: /pixi.js/, loader: "script" },
+        ]
+    },
+    resolve: {
+        alias: {
+            'phaser': phaser,
+            'pixi.js': pixi,
+            'p2': p2,
+        }
+    }
+    ...
+}
+```
+###### Main js file
+```
+require('pixi.js');
+require('p2');
+require('phaser');
+```
+
 ### Building from source
 
 Should you wish to build Phaser from source you can take advantage of the provided [Grunt](http://gruntjs.com/) scripts. Ensure you have the required packages by running `npm install` first.