configuration fils changes
SMTP added
Merge pull request #103 from Rakeshadlagatta/obsplatform-1.01

SMTP added
.
paypaladded in global
paypal added in global html file
paypal added in configuration
Merge pull request #105 from raghuvissu/obsplatform-1.01

paypal added in global file
.
conflictsremoving
Merge remote-tracking branch 'upstream/master'
'adding encryption from js file'
merge conflicts
edit pooling
Merge remote-tracking branch 'upstream/master'
'edit pooling'
Merge branch 'master' of https://github.com/avshyd/Clientapp
'conflicts for editpooling'
new commit
Merge pull request #124 from LAshokReddy556/master

editippool and add changes
ticket changes made here
Merge remote-tracking branch 'upstream/master'
Merge pull request #125 from Rakeshadlagatta/master

tickets changes