Merge branch 'master' of github.com:peerlibrary/peerlibrary into newdesign

Conflicts:
	client/templates/publication.html
Merge remote-tracking branch 'origin/newdesign'

Conflicts:
	client/templates/publication.html