Merge branch 'master_fixes' into 'master'

Till Brehm

2014-03-26 deb3716e433556f4d259a98ac3969169d11d779a

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