working changes
Merge remote-tracking branch 'origin/master' into uidev
Merge pull request #58 from vinayrajchoudhary/uidev

online ui changes