emaiFunktion change
Merge branch 'master' of https://github.com/elovators/elovator

Conflicts:
	functions/userFunctions.php