Added method for finding user by email/ displayName and fixed finding for id
Added password strategy for user password
Merge branch 'passwordEncryption' into development