server updated
Merge branch 'master' of https://github.com/sebastinantony/EmailService

Conflicts:
	Email.aspx.cs