Improved the get_user function
Fixed the PHP error undefined function get_userid_from_email()
Merge branch 'master' into 0016835

Conflicts:
	core/mail_api.php