+ fix history issue
Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix

Conflicts:
	kiwix/chrome/content/main/js/tools.js
Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix