Merge pull request #21 from Mayho/dev

Merge dev
fix gulp test for ci
Merge branch 'dev' of https://github.com/Blazur/blazur into dev
Merge branch 'dev' of github.com:Blazur/blazur into dev