diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn
index 8395d71..f868abe 100644
--- a/CHANGELOG.mkdn
+++ b/CHANGELOG.mkdn
@@ -72,8 +72,10 @@
 * Polish: Maciej Rozbicki
 * Korean: Inseok Lee
 * Traditional Chinese: Ladios Jonquil
+* Slovak: Juraj Janecek
+* Czech: Ondrej Zima
 
-CHANGELOG
+CHANGELOG (notable new features)
 ---------
 
 ### 7.1.0-pre
@@ -109,10 +111,24 @@
 * Common: Add CM copyright noticies - arcee
 * Common: Skia/Zlib/libcore ARM optimizations - 0xlab
 * Common: Bluetooth tethering - Stéphane Konstantaropoulos
+* Common: Lockscreen widget alignment - Danesh Mondegarian
+* Common: Lockscreen calendar - David Morgan
+* Common: AVRCP 1.3 support - Qualcomm (bugfix by Danny Baumann)
+* Common: LED notification overhaul - Danny Baumann
+* Common: System-wide DNS cache - Google, SEMC
+* Common: Headset icon toggle - Cameron Pickett
+* Common: FM seek support - Emilio López, Tom Giordano
+* Common: Editable event fields in Contacts app - Danny Baumann
+* Common: Remove compromised CA from system certs - Guardian Project
+* Common: Mute camera shutter option - Danesh Mondegarian
+* Common: Camera timer - Danesh Mondegarian
+* Common: "Mark all read" option in MMS - Vinod Surendran
+* Common: "eat" pushes fresh brunch/breakfast to device - Ricardo Cerqueira
+* Common: Customizable account color chip in Email - copolii
 * Click, Motorola: Speed up photo recording - Emilio López
 * Click, Motorola: Add Geolocation to photo app - KalimochoAz
 * Click: Upgraded kernel from HTC 2.6.29 to 2.6.35
-* Vision/Glacier/Ace/Speedy/Vivo/Vivow: 2.6.35 kernel and updated userspace
+* HTC msm7x30: 2.6.35 kernel and updated userspace
 * Buzz: 2.6.35 kernel - Arne Coucheron
 * Bravo(c)/Vivo(w)/Ace/Liberty: On charge notification led - Richard Antony Burton
 
diff --git a/overlay/jordan/packages/apps/Camera/res/values/config.xml b/overlay/jordan/packages/apps/Camera/res/values/config.xml
new file mode 100644
index 0000000..a6efecd
--- /dev/null
+++ b/overlay/jordan/packages/apps/Camera/res/values/config.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2011, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<!-- These resources are around just to allow their values to be customized
+     for different hardware and product builds. -->
+<resources>
+
+	<!-- Wide media profile available -->
+	<bool name="supportsWideProfile">true</bool>
+
+</resources>
diff --git a/overlay/ldpi/frameworks/base/core/res/res/layout/keyguard_screen_tab_unlock.xml b/overlay/ldpi/frameworks/base/core/res/res/layout/keyguard_screen_tab_unlock.xml
index 2c49fc4..ce8bc99 100644
--- a/overlay/ldpi/frameworks/base/core/res/res/layout/keyguard_screen_tab_unlock.xml
+++ b/overlay/ldpi/frameworks/base/core/res/res/layout/keyguard_screen_tab_unlock.xml
@@ -199,6 +199,14 @@
             android:layout_alignParentBottom="true"
             />
 
+        <com.android.internal.widget.RingSelector
+            android:id="@+id/ring_selector"
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_alignParentBottom="true"
+            />
+
         <!-- emergency call button shown when sim is PUKd and tab_selector is
              hidden -->
         <Button
diff --git a/overlay/ldpi/packages/apps/Camera/res/drawable-ldpi/bg_camera_pattern.png b/overlay/ldpi/packages/apps/Camera/res/drawable-ldpi/bg_camera_pattern.png
new file mode 100644
index 0000000..ffe6710
--- /dev/null
+++ b/overlay/ldpi/packages/apps/Camera/res/drawable-ldpi/bg_camera_pattern.png
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Phone/res/layout-mdpi/incall_touch_ui.xml b/overlay/ldpi/packages/apps/Phone/res/layout-mdpi/incall_touch_ui.xml
index 0855a96..fc8bcb4 100644
--- a/overlay/ldpi/packages/apps/Phone/res/layout-mdpi/incall_touch_ui.xml
+++ b/overlay/ldpi/packages/apps/Phone/res/layout-mdpi/incall_touch_ui.xml
@@ -48,6 +48,15 @@
         android:layout_alignParentBottom="true"
         />
 
+    <!-- (1) incomingCallWidget: the UI displayed while an incoming call is ringing. -->
+    <com.android.internal.widget.RingSelector
+        android:id="@+id/incomingRingSelectorCallWidget"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone"
+        android:layout_alignParentBottom="true"
+        />
+
     <!--
         (2) inCallControls: the widgets visible while a regular call
         (or calls) is in progress
diff --git a/overlay/ldpi/packages/apps/Phone/res/layout/incall_touch_ui.xml b/overlay/ldpi/packages/apps/Phone/res/layout/incall_touch_ui.xml
index a7981a8..be15c52 100644
--- a/overlay/ldpi/packages/apps/Phone/res/layout/incall_touch_ui.xml
+++ b/overlay/ldpi/packages/apps/Phone/res/layout/incall_touch_ui.xml
@@ -48,6 +48,15 @@
         android:layout_alignParentBottom="true"
         />
 
+    <!-- (1) incomingCallWidget: the UI displayed while an incoming call is ringing. -->
+    <com.android.internal.widget.RingSelector
+        android:id="@+id/incomingRingSelectorCallWidget"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone"
+        android:layout_alignParentBottom="true"
+        />
+
     <!--
         (2) inCallControls: the widgets visible while a regular call
         (or calls) is in progress
diff --git a/overlay/ldpi/packages/apps/Phone/res/layout/incall_touch_ui_left.xml b/overlay/ldpi/packages/apps/Phone/res/layout/incall_touch_ui_left.xml
index d6ac08e..2a79902 100644
--- a/overlay/ldpi/packages/apps/Phone/res/layout/incall_touch_ui_left.xml
+++ b/overlay/ldpi/packages/apps/Phone/res/layout/incall_touch_ui_left.xml
@@ -48,6 +48,15 @@
         android:layout_alignParentBottom="true"
         />
 
+    <!-- (1) incomingCallWidget: the UI displayed while an incoming call is ringing. -->
+    <com.android.internal.widget.RingSelector
+        android:id="@+id/incomingRingSelectorCallWidget"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone"
+        android:layout_alignParentBottom="true"
+        />
+
     <!--
         (2) inCallControls: the widgets visible while a regular call
         (or calls) is in progress
diff --git a/overlay/tablet/frameworks/base/core/res/res/values-de/strings.xml b/overlay/tablet/frameworks/base/core/res/res/values-de/strings.xml
new file mode 100644
index 0000000..84c41b6
--- /dev/null
+++ b/overlay/tablet/frameworks/base/core/res/res/values-de/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="lockscreen_carrier_default"></string>
+    <string name="power_dialog">Tabletoptionen</string>
+    <string name="reboot_system">Neu starten</string>
+    <string name="shutdown_confirm">Tablet wird heruntergefahren.</string>
+    <string name="reboot_confirm">Ihr Tablet wird neu gestartet.</string>
+    <string name="global_actions">Tabletoptionen</string>
+</resources>
diff --git a/overlay/tablet/packages/apps/Settings/res/values-de/strings.xml b/overlay/tablet/packages/apps/Settings/res/values-de/strings.xml
new file mode 100644
index 0000000..f7f40be
--- /dev/null
+++ b/overlay/tablet/packages/apps/Settings/res/values-de/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="about_settings">Über das Tablet</string>
+</resources>
diff --git a/prebuilt/common/bin/modelid_cfg.sh b/prebuilt/common/bin/modelid_cfg.sh
index 762b15c..175dc3d 100644
--- a/prebuilt/common/bin/modelid_cfg.sh
+++ b/prebuilt/common/bin/modelid_cfg.sh
@@ -48,8 +48,10 @@
 cat /proc/cmdline | egrep -q '(PD9812000)|(PD9814000)'
       if [ $? = 0 ];
          then
+            mv /system/etc/nam/CodecDSPID_MCLK.txt /system/etc
             mv /system/etc/nam/*MCLK.txt /system/etc/soundimage/
-            mv /system/etc/nam/CodecDSPID.txt /system/etc
+            mv /system/etc/nam/AdieHWCodec.csv /system/etc
+            mv /system/etc/nam/AIC3254_REG_DualMic_MCLK.csv /system/etc
             mv /system/etc/nam/gps.conf /system/etc
       fi
     rm -R /system/etc/nam
diff --git a/products/cyanogen_ace.mk b/products/cyanogen_ace.mk
index c43c97e..bfb826c 100644
--- a/products/cyanogen_ace.mk
+++ b/products/cyanogen_ace.mk
@@ -28,9 +28,6 @@
 # Add the Torch app
 PRODUCT_PACKAGES += Torch
 
-# Add AicBootFix for ace battery fix
-PRODUCT_PACKAGES += AicBootFix
-
 # Broadcom FM radio
 $(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
 
diff --git a/products/cyanogen_anzu.mk b/products/cyanogen_anzu.mk
index 47dae3d..65e844c 100644
--- a/products/cyanogen_anzu.mk
+++ b/products/cyanogen_anzu.mk
@@ -26,7 +26,7 @@
 PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/anzu
 
 # Add the Torch app
-#PRODUCT_PACKAGES += Torch
+PRODUCT_PACKAGES += Torch
 
 
 # BCM FM radio
diff --git a/products/cyanogen_fascinatemtd.mk b/products/cyanogen_fascinatemtd.mk
index 216fc5a..8a6a8a2 100644
--- a/products/cyanogen_fascinatemtd.mk
+++ b/products/cyanogen_fascinatemtd.mk
@@ -17,6 +17,9 @@
 # Extra fascinatemtd overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/fascinatemtd
 
+# Add the Torch app
+PRODUCT_PACKAGES += Torch
+
 #
 # Set ro.modversion
 #
diff --git a/products/cyanogen_hallon.mk b/products/cyanogen_hallon.mk
index 8a67fbb..817ab07 100644
--- a/products/cyanogen_hallon.mk
+++ b/products/cyanogen_hallon.mk
@@ -26,7 +26,7 @@
 PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/hallon
 
 # Add the Torch app
-#PRODUCT_PACKAGES += Torch
+PRODUCT_PACKAGES += Torch
 
 
 # BCM FM radio
diff --git a/products/cyanogen_mecha.mk b/products/cyanogen_mecha.mk
index b64f196..8bbb94a 100644
--- a/products/cyanogen_mecha.mk
+++ b/products/cyanogen_mecha.mk
@@ -20,9 +20,6 @@
 # Add the Torch app
 PRODUCT_PACKAGES += Torch
 
-# Add AicBootFix
-PRODUCT_PACKAGES += AicBootFix
-
 # Broadcom FM radio
 $(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
 
diff --git a/products/cyanogen_mesmerizemtd.mk b/products/cyanogen_mesmerizemtd.mk
index 754af54..90d24e5 100644
--- a/products/cyanogen_mesmerizemtd.mk
+++ b/products/cyanogen_mesmerizemtd.mk
@@ -17,6 +17,9 @@
 # Extra mesmerizemtd overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/mesmerizemtd
 
+# Add the Torch app
+PRODUCT_PACKAGES += Torch
+
 #
 # Set ro.modversion
 #
diff --git a/products/cyanogen_saga.mk b/products/cyanogen_saga.mk
index 79391ab..6f72184 100644
--- a/products/cyanogen_saga.mk
+++ b/products/cyanogen_saga.mk
@@ -28,9 +28,6 @@
 # Add the Torch app
 PRODUCT_PACKAGES += Torch
 
-# Add AicBootFix for saga battery fix
-PRODUCT_PACKAGES += AicBootFix
-
 # Broadcom FM radio
 $(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
 
diff --git a/products/cyanogen_showcasemtd.mk b/products/cyanogen_showcasemtd.mk
index 0e7e7f5..2968ceb 100644
--- a/products/cyanogen_showcasemtd.mk
+++ b/products/cyanogen_showcasemtd.mk
@@ -17,6 +17,9 @@
 # Extra showcasemtd overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/showcasemtd
 
+# Add the Torch app
+PRODUCT_PACKAGES += Torch
+
 #
 # Set ro.modversion
 #
diff --git a/products/cyanogen_vivo.mk b/products/cyanogen_vivo.mk
index 812d5fe..25ec9ac 100644
--- a/products/cyanogen_vivo.mk
+++ b/products/cyanogen_vivo.mk
@@ -28,9 +28,6 @@
 # Add the Torch app
 PRODUCT_PACKAGES += Torch
 
-# Add AicBootFix for vivo battery fix
-PRODUCT_PACKAGES += AicBootFix
-
 # Broadcom FM radio
 $(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
 
diff --git a/products/cyanogen_vivow.mk b/products/cyanogen_vivow.mk
index adb5187..7d7f823 100644
--- a/products/cyanogen_vivow.mk
+++ b/products/cyanogen_vivow.mk
@@ -25,9 +25,6 @@
 # Add the Torch app
 PRODUCT_PACKAGES += Torch
 
-# Add AicBootFix for vivow battery fix
-PRODUCT_PACKAGES += AicBootFix
-
 # Broadcom FM radio
 $(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
 
diff --git a/products/cyanogen_zeus.mk b/products/cyanogen_zeus.mk
index 4b95fd4..f6c6e09 100644
--- a/products/cyanogen_zeus.mk
+++ b/products/cyanogen_zeus.mk
@@ -26,7 +26,7 @@
 PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/zeus
 
 # Add the Torch app
-#PRODUCT_PACKAGES += Torch
+PRODUCT_PACKAGES += Torch
 
 
 # BCM FM radio
diff --git a/tools/leoupdate b/tools/leoupdate
index 4ed5348..8f43b8d 100755
--- a/tools/leoupdate
+++ b/tools/leoupdate
@@ -6,7 +6,7 @@
 
 cd "$LOC"/temp
 echo "extract update.zip"
-unzip -o -qq  "$LOC"/$TARGET_PRODUCT-ota-$TARGET_BUILD_VARIANT.$LOGNAME.zip
+unzip -o -qq  "$LOC"/$TARGET_PRODUCT-ota-$TARGET_BUILD_VARIANT.$USER.zip
 
 echo "Making Leo Compatible Update script"
 cd "$LOC"
@@ -22,8 +22,8 @@
 rm -rf "$LOC"/temp/boot.img
 rm -rf "$LOC"/temp/boot
 cp -a "$LOC"/boot "$LOC"/temp/boot
-rm -rf "$LOC"/$TARGET_PRODUCT-ota-$TARGET_BUILD_VARIANT.$LOGNAME.zip
-zip -9yr "$LOC"/$TARGET_PRODUCT-ota-$TARGET_BUILD_VARIANT.$LOGNAME.zip * > /dev/null
+rm -rf "$LOC"/$TARGET_PRODUCT-ota-$TARGET_BUILD_VARIANT.$USER.zip
+zip -9yr "$LOC"/$TARGET_PRODUCT-ota-$TARGET_BUILD_VARIANT.$USER.zip * > /dev/null
 cd "$LOC"
 
 echo Cleanup...
diff --git a/tools/opticharger b/tools/opticharger
index 203fd2b..f8a9d8a 100755
--- a/tools/opticharger
+++ b/tools/opticharger
@@ -25,7 +25,7 @@
 
 if [ "$APKCERTS" = "" ];
 then
-    APKCERTS=$OUT/obj/PACKAGING/target_files_intermediates/$TARGET_PRODUCT-target_files-$TARGET_BUILD_VARIANT.$LOGNAME/META/apkcerts.txt
+    APKCERTS=$OUT/obj/PACKAGING/target_files_intermediates/$TARGET_PRODUCT-target_files-$TARGET_BUILD_VARIANT.$USER/META/apkcerts.txt
     if [ ! -f "$APKCERTS" ];
     then
         echo "Set APKCERTS to the path to your apkcerts.txt file"
diff --git a/tools/squisher b/tools/squisher
index 61a3663..c82443f 100755
--- a/tools/squisher
+++ b/tools/squisher
@@ -24,9 +24,9 @@
 fi
 
 if [ "$TARGET_BUILD_TYPE" = "debug" ]; then
-    OTAPACKAGE=$OUT/${TARGET_PRODUCT}_debug-ota-$TARGET_BUILD_VARIANT.$LOGNAME.zip
+    OTAPACKAGE=$OUT/${TARGET_PRODUCT}_debug-ota-$TARGET_BUILD_VARIANT.$USER.zip
 else
-    OTAPACKAGE=$OUT/$TARGET_PRODUCT-ota-$TARGET_BUILD_VARIANT.$LOGNAME.zip
+    OTAPACKAGE=$OUT/$TARGET_PRODUCT-ota-$TARGET_BUILD_VARIANT.$USER.zip
 fi
 if [ ! -f "$OTAPACKAGE" ]; then
 	echo "$OTAPACKAGE doesn't exist!";