diff --git a/airtime_mvc/application/models/Locale.php b/airtime_mvc/application/models/Locale.php
index 8cbf34ed0..030d1513e 100644
--- a/airtime_mvc/application/models/Locale.php
+++ b/airtime_mvc/application/models/Locale.php
@@ -2,17 +2,32 @@
 
 class Application_Model_Locale
 {
+    public static $locales = array(
+    	    "en_CA" => "English (Canada)",
+            "en_GB" => "English (Britain)",
+            "en_US" => "English (USA)",
+            "cs_CZ" => "Český",
+            "de_DE" => "Deutsch",
+            "de_AT" => "Deutsch (Österreich)",
+            "el_GR" => "Ελληνικά",
+            "es_ES" => "Español",
+            "fr_FR" => "Français",
+            "hr_HR" => "Hrvatski",
+            "hu_HU" => "Magyar",
+            "it_IT" => "Italiano",
+            //"ja"    => "日本語",
+            "ko_KR" => "한국어",
+            "pl_PL" => "Polski",
+            "pt_BR" => "Português (Brasil)",
+            "ru_RU" => "Русский",
+            "sr_RS" => "Српски (Ћирилица)",
+            "sr_RS@latin" => "Srpski (Latinica)",
+            "zh_CN" => "简体中文"
+        );
+    
     public static function getLocales()
     {
-        $con = Propel::getConnection();
-        $sql = "SELECT * FROM cc_locale";
-        $res =  Application_Common_Database::prepareAndExecute($sql);
-        $out = array();
-        foreach ($res as $r) {
-            $out[$r["locale_code"]] = $r["locale_lang"];
-        }
-
-        return $out;
+        return self::$locales;
     }
 
     public static function configureLocalization($locale = null)
@@ -38,4 +53,5 @@ class Application_Model_Locale
         textdomain($domain);
         bind_textdomain_codeset($domain, $codeset);
     }
-}
\ No newline at end of file
+}
+
diff --git a/airtime_mvc/build/schema.xml b/airtime_mvc/build/schema.xml
index 8cf6e6987..684497769 100644
--- a/airtime_mvc/build/schema.xml
+++ b/airtime_mvc/build/schema.xml
@@ -474,11 +474,6 @@
       <reference local="mount_name_id" foreign="id"/>
     </foreign-key>
   </table>
-  <table name="cc_locale" phpName="CcLocale">
-    <column name="id" phpName="DbId" primaryKey="true" type="INTEGER" autoIncrement="true" required="true" />
-    <column name="locale_code" phpName="DbLocaleCode" type="VARCHAR" size="16" required="true" />
-    <column name="locale_lang" phpName="DbLocaleLang" type="VARCHAR" size="128" required="true" />
-  </table>
   <table name="cc_playout_history" phpName="CcPlayoutHistory">
     <column name="id" phpName="DbId" primaryKey="true" type="INTEGER" autoIncrement="true" required="true" />
     <column name="file_id" phpName="DbFileId" type="INTEGER" required="false" />
diff --git a/tests/README b/tests/README
new file mode 100644
index 000000000..60dff673d
--- /dev/null
+++ b/tests/README
@@ -0,0 +1,13 @@
+Airtime Tests
+
+Selenium: 
+- No prerequisites required.
+- To set it up and run it, run: 
+    $ ./run_selenium.sh
+
+
+Airtime web app unit tests:
+- See airtime_mvc/tests/README
+
+Airtime Analyzer unit tests
+- See python_app/airtime_analyzer/README 
diff --git a/tests/run_selenium.sh b/tests/run_selenium.sh
new file mode 100755
index 000000000..761c386ae
--- /dev/null
+++ b/tests/run_selenium.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+SELENIUM_BIN=selenium-server-standalone-2.42.2.jar
+SELENIUM_URL=http://selenium-release.storage.googleapis.com/2.42/selenium-server-standalone-2.42.2.jar
+
+printUsage()
+{
+    echo "Usage: ${0} airtime_url"
+    echo " Example: ${0} http://bananas.airtime.pro"
+}
+if [ -z "$1" ]
+then
+    printUsage
+    exit 1
+fi
+
+AIRTIME_URL="${1}"
+
+# Check if java is installed
+which java >& /dev/null
+if [ $? -gt 0 ]
+then
+    echo "java not found. Please install it."
+fi
+
+# Check for selenium-server 
+if [ ! -f ${SELENIUM_BIN} ]
+then
+    echo "Selenium not found, downloading it..."
+    wget ${SELENIUM_URL}
+fi
+
+# Check for xvfb-run, which lets us run Firefox in a headless X server
+which xvfb-run >& /dev/null
+if [ $? -gt 0 ]
+then
+    echo "xvfb-run not found, apt-getting it now..."
+    sudo apt-get install xvfb
+fi
+
+# You must pass the full path to the HTML suite and the results file to Selenium:
+xvfb-run java -jar ${SELENIUM_BIN} -htmlSuite "*firefox" "${AIRTIME_URL}" "${PWD}"/selenium/Airtime.html "${PWD}"/results.html
+