dkassa commit
working credentials
Merge branch 'dkassa'

Conflicts:
	package.json