made local changes
Merge branch 'master' of https://github.com/AbhilashTw/Mafia
changed log messages|manigann,melaniem
Merge branch 'master' of https://github.com/AbhilashTw/Mafia

Conflicts:
	src/screens/client/JoinedPlayersScreen.java
	src/screens/client/MafiaScreen.java
	src/screens/controls/ImagePanel.java
	src/screens/controls/MainFrame.java
resolved the screen resolutions and alignments|manigann,melaniem