save history
Merge branch 'master' of https://github.com/meoden1005/PaperMiner

Conflicts:
	WebContent/js/pm.js
	dat/new-query-pane.txt