Merge branch 'master' into 'master'

Marius Cramer

2015-06-02 6f2d95f4f36043e38b14599f5878af320566f8f4

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