Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/models/Preference.php

airtime_mvc/application/models/StoredFile.php

@@ -63,6 +63,10 @@ class StoredFile {
         return $this->_file->getDbFtype();
     }
 
+    public function getPropelOrm(){
+        return $this->_file;
+    }
+
     public function setFormat($p_format)
     {
         $this->_file->setDbFtype($p_format);