diff --git a/.gitignore b/.gitignore
index 95abdd8..e0a03fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,6 @@ gen/
 *.swp
 *~.nib
 local.properties
-project.properties
 .classpath
 .settings/
 .loadpath
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..972e607
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,15 @@
+language: android
+android:
+  components:
+    - build-tools-19.1.0
+    - android-19
+    - extra-android-support
+  licenses:
+    - 'android-sdk-license-.+'
+    - '.*intel.+'
+before_install:
+  - git submodule update --init --recursive
+install:
+  - ./setup-ant.sh
+script:
+  - ant debug && lint -w --exitcode --disable MissingTranslation .
diff --git a/ant.properties b/ant.properties
new file mode 100644
index 0000000..e69de29
diff --git a/build.xml b/build.xml
new file mode 100644
index 0000000..db1929c
--- /dev/null
+++ b/build.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="Lightning" default="help">
+
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <property file="local.properties" />
+
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
+         Here are some properties you may want to change/update:
+
+         source.dir
+             The name of the source directory. Default is 'src'.
+         out.dir
+             The name of the output directory. Default is 'bin'.
+
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
+
+         -->
+    <property file="ant.properties" />
+
+    <!-- if sdk.dir was not set from one of the property file, then
+         get it from the ANDROID_HOME env var.
+         This must be done before we load project.properties since
+         the proguard config can use sdk.dir -->
+    <property environment="env" />
+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+        <isset property="env.ANDROID_HOME" />
+    </condition>
+
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
+
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
+            unless="sdk.dir"
+    />
+
+    <!--
+        Import per project custom build rules if present at the root of the project.
+        This is the place to put custom intermediary targets such as:
+            -pre-build
+            -pre-compile
+            -post-compile (This is typically used for code obfuscation.
+                           Compiled code location: ${out.classes.absolute.dir}
+                           If this is not done in place, override ${out.dex.input.absolute.dir})
+            -post-package
+            -post-build
+            -pre-clean
+    -->
+    <import file="custom_rules.xml" optional="true" />
+
+    <!-- Import the actual build file.
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, replacing the <import> task.
+             - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
+    -->
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+
+</project>
diff --git a/lint.xml b/lint.xml
index 7edd00c..cd410d4 100644
--- a/lint.xml
+++ b/lint.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <lint>
+    <issue id="all">
+        <ignore path="external/**" />
+    </issue>
     <issue id="NewApi" severity="ignore" />
-</lint>
\ No newline at end of file
+</lint>
diff --git a/project.properties b/project.properties
new file mode 100644
index 0000000..39db97f
--- /dev/null
+++ b/project.properties
@@ -0,0 +1,15 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-20
+android.library.reference.1=external/netcipher/libnetcipher
diff --git a/res/layout/license_activity.xml b/res/layout/license_activity.xml
index 7953579..cc5553b 100644
--- a/res/layout/license_activity.xml
+++ b/res/layout/license_activity.xml
@@ -14,19 +14,19 @@
         android:paddingTop="10dp" >
 
         <TextView
-            android:id="@+id/textView9"
+            android:id="@+id/textView1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingLeft="10dp"
-            android:text="Lightning Browser"
+            android:text="@string/app_name"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <TextView
-            android:id="@+id/isImportAvailable"
+            android:id="@+id/isImportAvailable1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingLeft="10dp"
-            android:text="Mozilla Public License v. 2.0"
+            android:text="@string/mpl_license"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="@color/light" />
     </LinearLayout>
@@ -48,19 +48,19 @@
         android:paddingTop="10dp" >
 
         <TextView
-            android:id="@+id/textView9"
+            android:id="@+id/textView2"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingLeft="10dp"
-            android:text="Android Open Source Project"
+            android:text="@string/android_open_source_project"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <TextView
-            android:id="@+id/isImportAvailable"
+            android:id="@+id/isImportAvailable2"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingLeft="10dp"
-            android:text="Apache 2.0 License"
+            android:text="@string/apache"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="@color/light" />
     </LinearLayout>
@@ -81,19 +81,19 @@
         android:paddingTop="10dp" >
 
         <TextView
-            android:id="@+id/textView9"
+            android:id="@+id/textView3"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingLeft="10dp"
-            android:text="hpHosts Ad Server List"
+            android:text="@string/hphosts_ad_server_list"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <TextView
-            android:id="@+id/isImportAvailable"
+            android:id="@+id/isImportAvailable3"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingLeft="10dp"
-            android:text="Freeware"
+            android:text="@string/freeware"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="@color/light" />
     </LinearLayout>
@@ -103,4 +103,4 @@
                 android:layout_marginLeft="5dp"
                 android:layout_marginRight="5dp"
                 android:background="#cdcdcd" />
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/layout/settings.xml b/res/layout/settings.xml
index 24b7970..6dbe040 100644
--- a/res/layout/settings.xml
+++ b/res/layout/settings.xml
@@ -446,7 +446,7 @@
                     android:orientation="vertical" >
 
                     <TextView
-                        android:id="@+id/textView9"
+                        android:id="@+id/textView10"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:paddingLeft="10dp"
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 90a36c6..d68e32f 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -34,26 +34,16 @@
     <string name="cookies">تفعيل ملفات تعريف الارتباط</string>
     <string name="importbookmarks">استيراد العلامات المرجعية من المتصفح</string>
     <string name="size">حجم النص</string>
-    <string name="title_activity_advanced_settings">الإعدادات المتقدمة</string>
     <string name="recommended">(مستحسن)</string>
-    <string name="weird_look">(مواقع قد تبدو غريبة)</string>
     <string name="search">محرك البحث</string>
     <string name="search_hint">بحث</string>
     <string name="wideViewPort">استخدام إطار عرض واسع</string>
     <string name="overViewMode">تحميل الصفحات في نظرة عامة</string>
     <string name="restore">استعادة علامات التبويب المفقودة عند  البدء</string>
-    <string name="menu_history">السجل</string>
-    <string name="menu_add">إضافة إلى العلامات المرجعية</string>
-    <string name="menu_bookmarks">العلامات المرجعية</string>
-    <string name="menu_share">مشاركة</string>
-    <string name="menu_settings">الإعدادات</string>
-    <string name="menu_incognito">علامة تبويب التخفي</string>
-    <string name="menu_new_tab">علامة تبويب جديدة</string>
     <string name="stock_browser_unavailable">(لا يوجد مخزون في المتصفح)</string>
     <string name="stock_browser_available">(دعم مخزون المتصفح )</string>
     <string name="fullScreenOption">إخفاء شريط الحالة أثناء التصفح</string>
     <string name="clear_cookies">مسح ملفات تعريف الارتباط</string>
-    <string name="gestures">تفعيل إيماءات الأمام و الخلف</string>
     <string name="dialog_image">ماذا تريد أن تفعل مع هذه الصورة؟</string>
     <string name="action_download">تحميل</string>
     <string name="action_open">فتح</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 15cd2f6..d15aae3 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -31,7 +31,6 @@
     <string name="settings_title">Ajustes</string>
     <string name="download">Ruta de descargas</string>
     <string name="advanced">Ajustes avanzados</string>
-    <string name="gestures">Habilitar gestos de Atrás y Adelante</string>
     <string name="source">Código fuente</string>
     <string name="license">Licencia</string>
     <string name="github">github.com/anthonycr/Lightning-Browser</string>
@@ -47,7 +46,6 @@
     <string name="importbookmarks">Importar marcadores</string>
     <string name="size">Tamaño de la tipografía</string>
     <string name="recommended">(Recomendado)</string>
-    <string name="weird_look">(Puede causar visualización extraña)</string>
     <string name="search">Motor de búsquedas</string>
     <string name="search_hint">Buscar</string>
     <string name="custom_url">URL Personalizada</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 4f69a37..78eb107 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -16,10 +16,9 @@
     <string name="fullscreen">Activer le mode plein écran</string>
     <string name="java">Activer JavaScript</string>
     <string name="action_history">Historique</string>
-    <string name="action_add">Aj. favoris</string>
     <string name="action_bookmarks">Favoris</string>
     <string name="action_share">Partager</string>
     <string name="action_settings">Paramètres</string>
     <string name="action_incognito">Onglet incognito</string>
     <string name="action_new_tab">Nouvel onglet</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index a532e98..4d4a515 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -18,11 +18,10 @@
     <string name="fullscreen">Enable fullscreen mode</string>
     <string name="java">Enable JavaScript</string>
     <string name="action_history">History</string>
-    <string name="action_add">Aggiungi ai preferiti</string>
     <string name="action_bookmarks">Segnalibri</string>
     <string name="action_share">Azione</string>
     <string name="action_settings">Impostazioni</string>
     <string name="action_incognito">Incognito tab</string>
     <string name="action_new_tab">New tab</string>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index a87283c..edebe04 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -43,7 +43,6 @@
     <string name="importbookmarks">Импорт закладок</string>
     <string name="size">Размер текста</string>
     <string name="recommended">рекомендуется</string>
-    <string name="weird_look">сайты могут быть искажены</string>
     <string name="search">Поисковая система</string>
     <string name="search_hint">Поиск</string>
     <string name="wideViewPort">Широкий вид</string>
@@ -53,7 +52,6 @@
     <string name="stock_browser_available">браузер обнаружен</string>
     <string name="fullScreenOption">Без строки состояния</string>
     <string name="clear_cookies">Очистить cookies</string>
-    <string name="gestures">Жесты назад и вперёд</string>
     <string name="dialog_image">Выберите действие для изображения</string>
     <string name="action_download">Загрузить</string>
     <string name="action_open">Открыть</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 36c6d69..292090b 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -34,17 +34,14 @@
     <string name="cookies">Çerezleri etkinleştirme</string>
     <string name="importbookmarks">Tarayıcı yer imlerini içe aktarma</string>
     <string name="size">Metin boyutu</string>
-    <string name="title_activity_advanced_settings">Gelişmi Ayarlar</string>
     <string name="hello_world">Merhaba dünya!</string>
     <string name="recommended">(Önerilen)</string>
-    <string name="weird_look">(Web siteleri garip görünebilir)</string>
     <string name="search">Arama Motoru</string>
     <string name="search_hint">Arama</string>
     <string name="wideViewPort">Geniş görünüm kullanma</string>
     <string name="overViewMode">Genel bakış modunda sayfaları yükleme</string>
     <string name="restore">Kaybolan pencereleri başlangıçta yükleme</string>
     <string name="action_history">Geçmiş</string>
-    <string name="action_add">Yer imi ekle</string>
     <string name="action_bookmarks">Yer imleri</string>
     <string name="action_share">Paylaş</string>
     <string name="action_settings">Ayarlar</string>
@@ -53,4 +50,4 @@
     <string name="stock_browser_unavailable">(Hiçbir stok tarayıcı tespit edilemedi)</string>
     <string name="stock_browser_available">(Desteklenen stok tarayıcı tespit edildi)</string>
     
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index fb4acd5..65e2ca9 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -46,7 +46,6 @@
     <string name="importbookmarks">从浏览器中导入书签</string>
     <string name="size">页面文本尺寸</string>
     <string name="recommended">（推荐）</string>
-    <string name="weird_look">（可能导致部分网页排版混乱）</string>
     <string name="search">搜索引擎</string>
     <string name="search_hint">搜索</string>
     <string name="wideViewPort">使用宽视图</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 62fca8f..439e4d6 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -31,7 +31,6 @@
     <string name="settings_title">偏好設定</string>
     <string name="download">下載資料夾位置</string>
     <string name="advanced">進階設定</string>
-    <string name="gestures">啟動上一頁、下一頁手勢</string>
     <string name="source">原始碼</string>
     <string name="license">版權資訊</string>
     <string name="github">github.com/anthonycr/Lightning-Browser</string>
@@ -47,7 +46,6 @@
     <string name="importbookmarks">從其它瀏覽器匯入書籤</string>
     <string name="size">文字尺寸</string>
     <string name="recommended">(建議)</string>
-    <string name="weird_look">(網站看起來可能會有點古怪)</string>
     <string name="search">搜尋引擎</string>
     <string name="search_hint">搜尋</string>
     <string name="custom_url">自定 URL</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ea162d4..f8e7923 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -167,5 +167,9 @@
     <string name="clear_history_exit">Clear history on exit</string>
     <string name="folder_default">Default</string>
     <string name="folder_custom">Custom</string>
-    <string name="untitled">Untititled</string>
+    <string name="untitled">Untitled</string>
+    <string name="mpl_license">Mozilla Public License v. 2.0</string>
+    <string name="freeware">Freeware</string>
+    <string name="android_open_source_project">Android Open Source Project</string>
+    <string name="hphosts_ad_server_list">hpHosts Ad Server List</string>
 </resources>
diff --git a/setup-ant.bat b/setup-ant.bat
new file mode 100644
index 0000000..84311d1
--- /dev/null
+++ b/setup-ant.bat
@@ -0,0 +1,16 @@
+@ECHO OFF
+SETLOCAL enabledelayedexpansion
+
+SET "target=android-20"
+
+REM Update ant setup in project and all sub-projects
+SET "pattern=project.properties"
+FOR /R "./external/" %%# in (*.properties) DO (
+    ECHO %%~nx# | FIND "%pattern%" 1>NUL && (
+        SET current_dir=%~d0%%~p#
+        SET current_dir=!current_dir:\=/!
+        ECHO Updating ant setup in "!current_dir!"
+        CALL android update lib-project -t %target% -p "!current_dir!"
+    )
+)
+CALL android update project -p . --subprojects -t %target% --name Lightning
diff --git a/setup-ant.sh b/setup-ant.sh
index 2a0965e..a8011a8 100755
--- a/setup-ant.sh
+++ b/setup-ant.sh
@@ -1,9 +1,15 @@
 #!/bin/sh
 
-target="android-19"
+target="android-20"
 
+# Travis doesn't support android-20 yet
+if [ -n "$TRAVIS" ]; then
+    target="android-19";
+fi
+
+# Update ant setup in project and all sub-projects
 for f in `find external/ -name project.properties`; do
-projectdir=`dirname $f`
+    projectdir=`dirname $f`
     echo "Updating ant setup in $projectdir:"
     android update lib-project -p $projectdir -t $target
 done