sync
Merge branch 'master' of github.com:jyp/PaperTools

Conflicts:
	bibtex/jp.bib
	bibtex/shorten.sed