fraud
Merge remote-tracking branch 'origin/master'

Conflicts:
	karma.conf.js
	package.json
fraud