Merge branch 'master' into 'master'

Marius Cramer

2015-07-02 f3ff1e4ba5174dd559890483dd7dded8a04c10fd

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