Merge pull request #132 from Rakeshadlagatta/master

paymentgateway columns organized for all tabs
officeId addded to simple activation