It works!
Merge remote-tracking branch 'origin/master'

Conflicts:
	ver1/generatebookmarks.js