added flush to socket channel|melanie,manigann
Merge branch 'master' of https://github.com/AbhilashTw/Mafia
Merge branch 'master' of https://github.com/AbhilashTw/Mafia
removed reset in  socket channel|melanie,manigann
fixed the build.xml file
Villager screen modified|manigann,melanie