Start work for #28
use new function instead, remove old func

More work on #28
Merge branch 'master' into interfacemessage-pdo

Conflicts:
	includes/messages.php
remove empty file
Merge branch 'interfacemessage-pdo'