diff --git a/CONTRIBUTORS.mkdn b/CONTRIBUTORS.mkdn
index 31e833a..25d409c 100644
--- a/CONTRIBUTORS.mkdn
+++ b/CONTRIBUTORS.mkdn
@@ -10,7 +10,7 @@
 * __B&N NookColor (encore):__ eyeballer, fattire, keyodi, krylon360, sluo (NookieDevs)
 * __Google Galaxy Nexus:__ , bekit, Bumble-Bee, burnsra, KalimochoAz
 * __Google Nexus S:__ burnsra, KalimochoAz
-* __Google Nexus 7:__ 
+* __Google Nexus 7:__ fattire, nemith (GSM)
 * __HTC Evo 4G LTE:__ kushdeck, toastcfh
 * __HTC One S:__ intervigil, xkonni
 * __HTC One XL:__ h8rift, intervigil
diff --git a/config/common.mk b/config/common.mk
index 1c4cce9..7689760 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -210,7 +210,11 @@
 ifdef CM_RELEASE
     CM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(CM_BUILD)
 else
-    CM_VERSION := $(PRODUCT_VERSION_MAJOR)-$(shell date -u +%Y%m%d)-$(CM_BUILDTYPE)-$(CM_BUILD)$(CM_EXTRAVERSION)
+    ifeq ($(PRODUCT_VERSION_MINOR),0)
+        CM_VERSION := $(PRODUCT_VERSION_MAJOR)-$(shell date -u +%Y%m%d)-$(CM_BUILDTYPE)-$(CM_BUILD)$(CM_EXTRAVERSION)
+    else
+        CM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(shell date -u +%Y%m%d)-$(CM_BUILDTYPE)-$(CM_BUILD)$(CM_EXTRAVERSION)
+    endif
 endif
 
 PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/config/common_mini_tablet_wifionly.mk b/config/common_mini_tablet_wifionly.mk
new file mode 100644
index 0000000..fd4128c
--- /dev/null
+++ b/config/common_mini_tablet_wifionly.mk
@@ -0,0 +1,23 @@
+# Inherit common CM stuff
+$(call inherit-product, vendor/cm/config/common.mk)
+
+# Bring in all audio files
+include frameworks/base/data/sounds/NewAudio.mk
+
+# Include CM audio files
+include vendor/cm/config/cm_audio.mk
+
+# Default ringtone
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.config.ringtone=Orion.ogg \
+    ro.config.notification_sound=Deneb.ogg \
+    ro.config.alarm_alert=Hassium.ogg
+
+# BT config
+PRODUCT_COPY_FILES += \
+    system/bluetooth/data/main.nonsmartphone.conf:system/etc/bluetooth/main.conf
+
+ifeq ($(TARGET_SCREEN_WIDTH) $(TARGET_SCREEN_HEIGHT),$(space))
+    PRODUCT_COPY_FILES += \
+        vendor/cm/prebuilt/common/bootanimation/800.zip:system/media/bootanimation.zip
+endif
diff --git a/jenkins-build-targets b/jenkins-build-targets
index 3f12363..873122a 100644
--- a/jenkins-build-targets
+++ b/jenkins-build-targets
@@ -30,6 +30,7 @@
 cm_jewel-userdebug
 cm_maguro-userdebug
 cm_mango-userdebug
+cm_manta-userdebug
 cm_mesmerizemtd-userdebug
 cm_mint-userdebug
 cm_n7000-userdebug
@@ -59,6 +60,7 @@
 cm_smultron-userdebug
 cm_stingray-userdebug
 cm_su640-userdebug
+cm_tilapia-userdebug
 cm_t769-userdebug
 cm_tf101-userdebug
 cm_tf201-userdebug
diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_en.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_en.dict
index 2d70d3a..18a95b3 100644
--- a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_en.dict
+++ b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_en.dict
Binary files differ