Test Salaam connection.

Signed-off-by: aiemsal <iemsal.assous@gmail.com>
Merge branch 'master' of https://github.com/SupinfoGameDev/XOXO

Conflicts:
	XOXO.userprefs
	XOXO_Droid/Resources/Resource.designer.cs
	XOXO_Droid/XOXO_Droid.csproj
	XOXO_Droid/obj/Debug/XOXO_Droid.csproj.FileListAbsolute.txt
	XOXO_Droid/obj/Debug/XOXO_Droid.pdb
	XOXO_Droid/obj/Debug/acw-map.txt
	XOXO_Droid/obj/Debug/android/AndroidManifest.xml
	XOXO_Droid/obj/Debug/android/bin/classes.dex
	XOXO_Droid/obj/Debug/android/bin/classes/mono/MonoPackageManager.class
	XOXO_Droid/obj/Debug/android/bin/classes/mono/MonoPackageManager_Resources.class
	XOXO_Droid/obj/Debug/android/bin/classes/mono/MonoRuntimeProvider.class
	XOXO_Droid/obj/Debug/android/bin/classes/mono/android/Seppuku.class
	XOXO_Droid/obj/Debug/android/bin/classes/xoxo_droid/xoxo_droid/R$attr.class
	XOXO_Droid/obj/Debug/android/bin/classes/xoxo_droid/xoxo_droid/R$drawable.class
	XOXO_Droid/obj/Debug/android/bin/classes/xoxo_droid/xoxo_droid/R$id.class
	XOXO_Droid/obj/Debug/android/bin/classes/xoxo_droid/xoxo_droid/R$layout.class
	XOXO_Droid/obj/Debug/android/bin/classes/xoxo_droid/xoxo_droid/R$raw.class
	XOXO_Droid/obj/Debug/android/bin/classes/xoxo_droid/xoxo_droid/R$string.class
	XOXO_Droid/obj/Debug/android/bin/classes/xoxo_droid/xoxo_droid/R$style.class
	XOXO_Droid/obj/Debug/android/bin/classes/xoxo_droid/xoxo_droid/R.class
	XOXO_Droid/obj/Debug/android/bin/mono.android.jar
	XOXO_Droid/obj/Debug/android/bin/packaged_resources
	XOXO_Droid/obj/Debug/android/src/mono/MonoPackageManager.java
	XOXO_Droid/obj/Debug/android/src/xoxo_droid/xoxo_droid/R.java
	XOXO_Droid/obj/Debug/android/xoxo_droid/xoxo_droid/R.java
	XOXO_Droid/obj/Debug/assemblies/Mono.Android.dll
	XOXO_Droid/obj/Debug/assemblies/Mono.Android.dll.mdb
	XOXO_Droid/obj/Debug/assemblies/XOXO_Droid.dll
	XOXO_Droid/obj/Debug/assemblies/XOXO_Droid.dll.mdb
	XOXO_Droid/obj/Debug/res/layout/about.xml
	XOXO_Droid/obj/Debug/res/layout/menu.xml
	XOXO_Droid/obj/Debug/res/values/styles.xml
	XOXO_Droid/obj/Debug/resolved_assemblies.txt

Signed-off-by: aiemsal <iemsal.assous@gmail.com>