Seema: silly errors made and corrections thereafter
Seema: Merged conflicts
Merge pull request #163 from InsolvencyService/resolving_merge_conflicts

Resolving merge conflicts