Fix for mailrestore, to avoid confusion about web- and mail-backups with same ids

- http://en.wikipedia.org/wiki/SPDY

- Directive snippets can now be made available to clients; clients can select an available directive snippet for a website - the appropriate snippet will then be written to the vhost configuration file. This is useful for example on nginx where clients have no access to the Options tab of a website.

- Added incremental sql query collection file to make merging easier and avoid high patch file count