Allow username or email for sign in/up
Fixes #89`
Merge branch 'master' of https://github.com/peerlibrary/peerlibrary

Conflicts:
	client/header.coffee