Merge https://github.com/peerlibrary/peerlibrary
Merge branch 'master' of github.com:peerlibrary/peerlibrary
Merge branch 'development'