fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	dist/km.all.min.js