confirms, emails, delete bug fix
Merge pull request #10 from adamthede/mondayNat

confirms, emails, delete bug fix
updates including webcam profile picture integration
fixed links on emails
merge approve
Merge pull request #11 from adamthede/webcam

updates including webcam profile picture integration
Merge pull request #12 from adamthede/mondayNat

fixed links on emails
merge
merge

emote-tracking branch 'origin' into css-barter-03-10

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.