added email support for the project
merge conflict solved
Merge branch 'master' of https://github.com/SvenWinkler/ThatsMyKid
renamed pictuture events
Merge branch 'master' of https://github.com/SvenWinkler/ThatsMyKid