Merge pull request #115 from Rakeshadlagatta/obsplatform-2.03

NationalId added to file
sortBy changes
Merge branch 'obsplatform-2.03'
Merge pull request #117 from Rakeshadlagatta/master

sortBy changes