Merge branch 'dev' of https://github.com/GoodBoyDigital/pixi.js into dev
                
                  
...
                
                
                
                  Conflicts:
	src/core/graphics/webgl/GraphicsRenderer.js
	src/pixi/primitives/Graphics.js
	src/pixi/renderers/webgl/WebGLRenderer.js
	src/pixi/renderers/webgl/shaders/PixiShader.js
	src/pixi/renderers/webgl/utils/WebGLFilterManager.js
	src/pixi/renderers/webgl/utils/WebGLShaderManager.js
	src/pixi/renderers/webgl/utils/WebGLSpriteBatch.js
	src/pixi/textures/RenderTexture.js
                
                  
                  
                  mathew groves
                  committed 
  
    
      on 28 Jan 2015