.
Merge remote-tracking branch 'upstream/master'
Merge pull request #80 from Rakeshadlagatta/master

changes to mydevice edit screen
.
Merge remote-tracking branch 'upstream/master'
changes in credit distribution.html and its controller
Merge pull request #81 from raghuvissu/master

changes in credit distribution.html and its controller
here extension popup added in view order