server response changed to JSON
Merge branch 'gaurav'