AS
Merge branch 'master' of git@github.com:jukqaz/Prevo_Final.git

Conflicts:
	Central Server/[step03]_netty_android_client/bin/AndroidManifest.xml
	Central
Server/[step03]_netty_android_client/bin/classes/prevo/client/cert/JoinActivity.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/PasswordActivity.class
	Central
Server/[step03]_netty_android_client/bin/classes/prevo/client/service/ChatModHandler$1.class
	Central
Server/[step03]_netty_android_client/bin/classes/prevo/client/service/ChatModHandler$2.class
	Central
Server/[step03]_netty_android_client/bin/classes/prevo/client/service/ChatModHandler$3.class
	Central
Server/[step03]_netty_android_client/bin/classes/prevo/client/service/ChatModHandler.class
	Central
Server/[step03]_netty_android_client/bin/classes/prevo/client/service/FileReceiver.class
	Central
Server/[step03]_netty_android_client/bin/classes/prevo/client/util/ClientUtils.class
	Central Server/[step03]_netty_android_client/gen/prevo/client/R.java
SIBAL