adding gulp
Merge branch 'master' of github.com:cbragard/angular-sid
fix for travis
Merge branch 'master' of https://github.com/cbragard/angular-sid

Conflicts:
	package.json