java.lang.*
searcing modified in all
Merge remote-tracking branch 'upstream/master'
Merge pull request #9 from lalsingh161/master

New Searching is modified check it
paymentGateway
paymentGateway
delete patches
Merge pull request #11 from ashokreddy56/master

new payment gateway
Hardwareplan,plans,chargecode
Merge remote-tracking branch 'upstream/master'
Merge pull request #12 from Rakeshadlagatta/master

Changes here please check it
Merge pull request #13 from kiranhugo/master

Changes in User
Changes in search
conflicts
ashok code added
resolved foreign key constraint issue in epg and null pointer exception was resolved in previous commit
error messaged order aligned and ownedhardware close issue is fixed
stalker and mpesa integrations
Merge pull request #16 from ashokreddy56/master

stalker and mpesa integrations
Merge pull request #15 from rahman38/master

Issue Foreign key constraint in EPG resolved