authentication
Merge branch 'master' of github.com:peerlibrary/peerlibrary
Merge branch 'master' of github.com:peerlibrary/peerlibrary
Merge branch 'master' into new-annotations

Conflicts:
	client/css/_header.styl