-fixed joey and my routes -> safe now
Merge branch 'master' of https://github.com/ischweizer/phdpapertool