fixpath and so on
Merge remote-tracking branch 'origin/master'

Conflicts:
	libs/dato.js
	package.json
😍add class