Merge remote-tracking branch 'origin/master'
[Silviu] modified setting for SMTP server to be looked up from JNDI resources
[Silviu] added documentation for JNDI configuration
Merge remote-tracking branch 'origin/master'