Merge branch 'master' of https://github.com/asquel/grunt-bridge

Conflicts:
	composer.json
Merge branch 'master' of https://github.com/asquel/grunt-bridge
bizarre ...