separate send to email from send to server
Merge branch 'master' of https://github.com/PDSD-2014/baluta-foianu