taking nayan's changes
Merge remote-tracking branch 'origin/master' into neha
changes for getAllMembers
Merge remote-tracking branch 'origin/master' into neha
Renamed few resources
deleted no longer required files