fixed emailing issues
Merge branch 'master' of github.com:davidrivera/waterlock