Fixed js
Merge remote-tracking branch 'origin/master'

Conflicts:
	kpd.sublime-workspace