Some bug fixes
Merge branch 'master' of https://github.com/msyk/INTER-Mediator

Conflicts:
	lib/mailsend/OME.php