before merge
Restore Commit mm
Merge branch 'master' of github.com:jukqaz/Prevo_Final

Conflicts:
	Central Server/[step03]_netty_android_client/bin/classes/prevo/client/R$id.class
	Central Server/[step03]_netty_android_client/bin/classes/prevo/client/R$layout.class
	Central Server/[step03]_netty_android_client/bin/classes/prevo/client/R$string.class
	Central Server/[step03]_netty_android_client/bin/classes/prevo/client/R$styleable.class
	Central Server/[step03]_netty_android_client/bin/classes/prevo/client/cert/CertificationActivity$1.class
	Central Server/[step03]_netty_android_client/bin/classes/prevo/client/cert/CertificationActivity.class
	Central Server/[step03]_netty_android_client/bin/classes/prevo/client/conf/TemporaryInfo.class
	Central Server/[step03]_netty_android_client/bin/classes/prevo/client/lobby/LobbyActivity.class
	Central Server/[step03]_netty_android_client/bin/classes/prevo/client/ppt/PPTRoomActivity$1.class
	Central Server/[step03]_netty_android_client/bin/classes/prevo/client/ppt/PPTRoomActivity.class
	Central Server/[step03]_netty_android_client/bin/classes/prevo/client/service/CPSManager.class
	Central Server/[step03]_netty_android_client/bin/classes/prevo/client/service/ChatModHandler.class
	Central Server/[step03]_netty_android_client/bin/classes/prevo/client/util/NetworkManager.class
	Central Server/[step03]_netty_tablet_client/src/prevo/client/video/CameraPreview.java
	Central Server/[step03]_netty_tablet_client/src/prevo/client/video/VideoRoomActivity.java