Added email/lostpassword
Added Email/lostpassword

Conflicts:
	bin/.gitignore