createprice screen cancel button id updated
Merge remote-tracking branch 'upstream/master'
..
Merge remote-tracking branch 'upstream/master'
address master bugs fixed
Merge pull request #255 from raghuvissu/master

createprice screen cancel button id updated
Merge pull request #256 from Ranjith15/master

viewdiscount
Merge pull request #257 from Rakeshadlagatta/master

Date time Event Master
.
.
locale changes
Merge remote-tracking branch 'upstream/master'