Merge branch 'develop' into 'master'

Falko Timme

2014-12-13 39fab06dfae1e0218a1bb3aa48a381586dfaea6d

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