Merge pull request #13 from pemami4911/patrick

Patrick
Fixed a bug with email confirmation
Merge branch 'master' of https://github.com/pemami4911/Osprey into patrick

"merging is always necessary"
.