Description
Merge branch 'master' of github.com:Papiel/cluestr-provider

Conflicts:
	package.json