.
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
code update of taxMap
code update after conflict
.
Merge remote-tracking branch 'upstream/master'
Merge pull request #42 from Rakeshadlagatta/master

Tickets
codechanges
Merge remote-tracking branch 'upstream/master'
Merge pull request #43 from Ranjith15/master

code cleanup
.
Merge pull request #44 from kiranhugo/master

cleanup done in Inventory module
change to eventmaster
Merge remote-tracking branch 'upstream/master'