Conflicts:
	interface/lib/classes/tpl.inc.php
	interface/web/mail/lib/lang/de_spamfilter_blacklist.lng
	interface/web/mail/lib/lang/de_spamfilter_users.lng
	interface/web/mail/lib/lang/de_spamfilter_whitelist.lng
	server/lib/classes/tpl.inc.php

Master

Conflicts:
	interface/lib/classes/remoting.inc.php
	server/cron_daily.php

- Use it like $app->conf('yourpluginname', 'config-key', 'value')
- omit the value to read the config value, provide it to set the value

Changed mode of web folder from 0710 to 0711 to make it comaptibe with servers that use NFS for /var/www.

- database users
- email forwarders and aliases
- clients

Vmail-UID/GID

Added missing change of uid/gid for vmail when updating mail-user