Added email sending and forgot password function
Fixed conflicts