- merged different fixes and updates from foreign branches

Marius Burkard

2016-01-04 d22277878254cf33fd63ca1bf12b215f4e030a27

1
ALTER TABLE `web_domain` ADD `document_root_www` VARCHAR( 255 ) NULL AFTER `document_root`;