diff --git a/changeAppSettings.sh b/changeAppSettings.sh
index b9a33c1f4..d382b4dd6 100755
--- a/changeAppSettings.sh
+++ b/changeAppSettings.sh
@@ -854,6 +854,9 @@ cd ../../..
 if [ "$GooglePlayGameServicesId" = "n" -o -z "$GooglePlayGameServicesId" ] ; then
 	$SEDI "/==GOOGLEPLAYGAMESERVICES==/ d" project/AndroidManifest.xml
 	GooglePlayGameServicesId=""
+	grep 'google-play-services' project/local.properties > /dev/null && {
+		$SEDI 's/.*google-play-services.*//g' project/local.properties
+	}
 else
 	for F in $JAVA_SRC_PATH/googleplaygameservices/*.java; do
 		OUT=`echo $F | sed 's@.*/@@'` # basename tool is not available everywhere
@@ -863,7 +866,7 @@ else
 	done
 	$SEDI "s/==GOOGLEPLAYGAMESERVICES_APP_ID==/$GooglePlayGameServicesId/g" project/res/values/strings.xml
 	SDK_DIR=`grep '^sdk.dir' project/local.properties | sed 's/.*=//'`
-	grep 'android.library.reference.1' project/local.properties > /dev/null || {
+	grep 'google-play-services' project/local.properties > /dev/null || {
 		# Ant is way too smart, and adds current project path in front of the ${sdk.dir}
 		echo 'android.library.reference.1=../../../../../../../../../../../../../../${sdk.dir}/extras/google/google_play_services/libproject/google-play-services_lib' >> project/local.properties
 		echo 'proguard.config=proguard.cfg;proguard-local.cfg' >> project/local.properties
diff --git a/project/jni/application/xserver-debian/AndroidAppSettings.cfg b/project/jni/application/xserver-debian/AndroidAppSettings.cfg
index a4ede304e..6f7d350cf 100644
--- a/project/jni/application/xserver-debian/AndroidAppSettings.cfg
+++ b/project/jni/application/xserver-debian/AndroidAppSettings.cfg
@@ -7,10 +7,10 @@ AppName="Debian"
 AppFullName=com.cuntubuntu
 
 # Application version code (integer)
-AppVersionCode=140704
+AppVersionCode=141006
 
 # Application user-visible version name (string)
-AppVersionName="14.07.04"
+AppVersionName="14.10.06"
 
 # Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...'
 # If you'll start Description with '!' symbol it will be enabled by default, other downloads should be selected by user from startup config menu
diff --git a/project/jni/application/xserver-debian/xserver b/project/jni/application/xserver-debian/xserver
index 3cce1acc1..670f48dfe 160000
--- a/project/jni/application/xserver-debian/xserver
+++ b/project/jni/application/xserver-debian/xserver
@@ -1 +1 @@
-Subproject commit 3cce1acc1f943ded8491e1be814aebfce6e09023
+Subproject commit 670f48dfe9358e7078119998befe80a88e434977
diff --git a/project/res/raw/ultimatedroid.raw b/project/res/raw/ultimatedroid.raw
index fa4c1802c..c86a54055 100644
Binary files a/project/res/raw/ultimatedroid.raw and b/project/res/raw/ultimatedroid.raw differ
diff --git a/todo.txt b/todo.txt
index 8d427382a..6c2eccc4d 100644
--- a/todo.txt
+++ b/todo.txt
@@ -27,14 +27,10 @@ TODO, which will get actually done
 
 - Debian noroot: support multiple external storage locations.
 
-- Debian noroot: support Android intent x11://localhost:6000 - http://www.openintents.org/node/905 .
-
-- OpenTTD: cloud save support.
-
-- OpenTTD: Town window too tall.
-
-- OpenTTD: Togglable legend area for map window.
+- XSDL: support Android intent x11://localhost:6000 - http://www.openintents.org/node/905
 
 - Nvidia Shield D-Pad does not send any events (probably acts as 3-rd joystick).
 
 - USB Keyboard: touchpad mode, configurable mouse speed, show keyboard LEDs, show error when root is not installed.
+
+- S Planner Killer: options to restore calendar settiongs, and to kill lock-screen widget.