email service
fixed people Online bug
merged kandice's stuff