made all changes other than test cases
Merge branch 'merge_branch' of github.com:Kavit900/expertiza into merge_branch