fixed bugs in merging features from multiple input files
Added unit test for feature merging.
Merge branch 'feature/fixed_merging_features' into develop