- fixing document merging
- moving merging logic into document class
- added test
Merge branch 'hotfix/doc_merging' into bamboo