Merge branch 'master' into upload
Merge branch 'upload' of https://github.com/peerlibrary/peerlibrary into upload
Subscribe only on the right page