Merge branch 'master' into staging
Merge branch 'staging' of github.com:Velaport/widgets-login
Use gulp instead of grunt
Merge branch 'master' of github.com:Velaport/widgets-login

Conflicts:
	package.json