# Conflicts:
#	src/mesh/Mesh.js

* Update WebGLRenderer.js

```
    this._activeRenderTarget = null;
    this._activeTextureLocation = 999;
    this._activeTexture = null;
````
must before `this._indexContext()` , otherwise  the _activeRenderTarget & _activeTexture init in  _indexContext will back to `null`.

* Add a blank line for cosmetic.

# Conflicts:
#	src/mesh/Mesh.js

Dev vao state cache

* minimal texture bounds pass 1

* cheeky opts

* tidy up code

* create empty textures

* added empty texture

* couple more tweaks

* fixed empty texture issue

* fixed tweaked so id's sit on glTexture

means it should work on multiple contexts

* tweaked unbound textures

* tidy up

* upped max textures to 4 for mobile!

also sending state to tiling sprite VAO

* removed _activeTetureLocation

* tweaked eslint

* make sure buffer is bound

* updates based on @englercj review points

- Added vertexCount back in as it still yields much faster results in
iOS
- Tidied old comments
- Replaced i++ with ++i

Looks like since we call loseContext() on `WebGLRenderer#destroy()` that
if you create another WebGLRenderer with the same canvas the browser will
recycle that lost context and return it.

This means when we try to use the context it is actually in a lost state.
This change tries to restore a lost context before we use it. It also adds
a debug assert at one location that will be invalid if the context is
invalid.

* some more es6 changes
- const instead of let if possible
- arrow functions
- string templates
- argument defaults

* object property shorthand

* some more es6 changes
- const instead of let if possible
- arrow functions
- string templates
- argument defaults

* Revert "Merge branch 'dev-es6-sb' of github.com:stbaer/pixi.js into dev-es6-sb"

This reverts commit 8d3af81, reversing
changes made to e8b9948.

* Revert "Merge branch 'dev-es6' into dev-es6-sb"

This reverts commit 3eeaf79, reversing
changes made to fb69536.

* Revert "Revert "Merge branch 'dev-es6-sb' of github.com:stbaer/pixi.js into dev-es6-sb""

This reverts commit c860228.

* fix RenderTexture, incomplete merge

* fix for text font properties

* reverted some changes

* checked out License, Readme and Contributinf from dev-es6

* editorconfig updated: 2 spaces for .eslintrc

* added eslint rule: spaces around fat arrow

* used eslint fix for consistent spaces around fat arrow

* don't allow scale.x or scale.y to be 0 in displayObject setTransform

* removed jshint comments (again)

* Migration to ES6 classes

* Migration to ES6 classes

* Migration to ES6 classes

* Migration to ES6 classes

* Using babelify to transpile ES6 code

* Adding babel-preset-es2015 in devDependencies

* Epic run through the docs

* Fixed merge issue

* PIXI.utils now outputs its documentation correctly

Added context validator

# Conflicts:
#	src/core/renderers/webgl/WebGLRenderer.js
#	src/core/sprites/webgl/SpriteRenderer.js
#	src/extract/canvas/CanvasExtract.js
#	src/extract/webgl/WebGLExtract.js