misc
Merge branch 'master' of ssh://github.com/xPapers/xPapers
Merge branch 'master' into pdf_downloader

Conflicts:
	sql/1.2-1.3/core.sql