PUlling Gurnit changes
Fixed duplicates, server side code should be working properly.
resolved conflicts.