Merge pull request #58 from Ranjith15/master

after conflict & disconnect credit
.
Merge remote-tracking branch 'upstream/master'
.
Merge pull request #59 from kiranhugo/master

done some changes related to transactionhistory
remove column headerdata