remove grunt-contrib-watch
bump to v1.5.1, add new builds
@param doc about scaleMode in Texture.fromImage
@param doc about scaleMode in Texture.fromCanvas
Added doc for BaseTexture.fromCanvas
Merge pull request #638 from jeena/master

Added missing documentation for a method and two params
Merge branch 'dev'
Docs updated and files published
Merge branch 'master' of https://github.com/GoodBoyDigital/pixi.js

Conflicts:
	bin/pixi.dev.js
	bin/pixi.js
	package.json
	src/pixi/Pixi.js
Merged Devbranch
republished files
Merge branch 'dev'

Conflicts:
	bin/pixi.dev.js
	bin/pixi.dev.js.map
	bin/pixi.js
	examples/example 19 - CacheAsBitmap/index.html
	src/pixi/display/DisplayObject.js
updated docs
Extras - spine: Fix color timeline handling: alpha and color tint
Merge pull request #727 from wojciak/master

Extras - spine: Fix color timeline handling: alpha and color tint
init
fix
Merge pull request #1 from MultivitaminLLC/init

Init
gitignore
ignore