updated master, resolved conflicts

A. Täffner

2016-01-22 ce6e1ddfd09c47fc3f80e4fccc238894cf560ddb

1
ALTER TABLE `web_domain` ADD `backup_excludes` MEDIUMTEXT NULL AFTER `backup_copies` ;