Merge branch '2.5.x' into saas

Conflicts:
	airtime_mvc/application/models/Show.php

airtime_mvc/application/models/Show.php

@@ -1137,7 +1137,6 @@ SELECT s.name,
        s.genre,
        s.id,
        si.id AS instance_id,
-       si.description AS instance_description,
        si.record,
        s.url,
        s.image_path,
@@ -1226,7 +1225,6 @@ SELECT si.starts AS start_timestamp,
        s.description,
        s.id,
        si.id AS instance_id,
-       si.description AS instance_description,
        si.record,
        s.url,
        s.image_path,
@@ -1273,7 +1271,6 @@ SQL;
                     $results['previousShow'][0] = array(
                             "id"                      => $rows[$i-1]['id'],
                             "instance_id"             => $rows[$i-1]['instance_id'],
-                            "instance_description"    => $rows[$i-1]['instance_description'],
                             "name"                    => $rows[$i-1]['name'],
                             "description"            => $rows[$i-1]['description'],
                             "url"                     => $rows[$i-1]['url'],
@@ -1292,7 +1289,6 @@ SQL;
                     $results['nextShow'][0] =  array(
                             "id"                     => $rows[$i+1]['id'],
                             "instance_id"             => $rows[$i+1]['instance_id'],
-                            "instance_description"    => $rows[$i+1]['instance_description'],
                             "name"                    => $rows[$i+1]['name'],
                             "description"             => $rows[$i+1]['description'],
                             "url"                     => $rows[$i+1]['url'],
@@ -1335,7 +1331,6 @@ SQL;
             $results['previousShow'][0] = array(
                     "id"                      => $rows[$previousShowIndex]['id'],
                     "instance_id"             => $rows[$previousShowIndex]['instance_id'],
-                    "instance_description"    => $rows[$previousShowIndex]['instance_description'],
                     "name"                    => $rows[$previousShowIndex]['name'],
                     "description"             => $rows[$previousShowIndex]['description'],
                     "start_timestamp"         => $rows[$previousShowIndex]['start_timestamp'],

airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po

@@ -9,19 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Airtime\n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2014-07-25 14:36-0400\n"
-"PO-Revision-Date: 2014-01-29 15:10+0000\n"
-"Last-Translator: andrey.podshivalov\n"
-"Language-Team: French (France) (http://www.transifex.com/projects/p/airtime/"
-"language/fr_FR/)\n"
-"Language: fr_FR\n"
-=======
 "POT-Creation-Date: 2013-12-13 12:58-0500\n"
 "PO-Revision-Date: 2014-09-11 09:33+0000\n"
 "Last-Translator: AlbertFR <albert.bruc.ab@gmail.com>\n"
 "Language-Team: French (France) (http://www.transifex.com/projects/p/airtime/language/fr_FR/)\n"
->>>>>>> 2.5.x
+"Language: fr_FR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"