added mail sender
Merge remote-tracking branch 'origin/master' into origin_master

Conflicts:
	ch.bfh.bti7081.s2013.yellow/pom.xml