Basic E-mail function.
Not sure if these should be added!
pom conflict resolved
...
more pom
Merge remote-tracking branch 'origin/master'