Merge items from master_site when fallback is enabled
Merge pull request #306 from opps/merge_boxes

Merge items from master_site when fallback is enabled