Merge branch 'master' of https://github.com/Izzimach/react-pixi
Fixed conflicts in merge with dev
Merge branch 'dev'
Merge branch 'dev'
Add bower install to travis.yml