small fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/services/provider.js
Merge remote-tracking branch 'origin/master'
lint

doc added