Merge branch 'saas' into saas-embed-player

Conflicts:
	airtime_mvc/application/configs/ACL.php

python_apps/airtime_analyzer/airtime_analyzer/status_reporter.py

@@ -129,6 +129,7 @@ def send_http_request(picklable_request, retry_queue):
         retry_queue.append(picklable_request) # Retry it later
     except Exception as e:
         logging.error("HTTP request failed with unhandled exception. %s" % str(e))
+        logging.error(traceback.format_exc())
         # Don't put the request into the retry queue, just give up on this one.
         # I'm doing this to protect against us getting some pathological request
         # that breaks our code. I don't want us pickling data that potentially

python_apps/airtime_analyzer/tools/ftp-upload-hook.sh

@@ -2,10 +2,14 @@
 
 post_file() {
     #kill process after 30 minutes (360*5=30 minutes)
-    max_retry=360
+    max_retry=5
     retry_count=0
 
     file_path="${1}"
+    # Give us write permissions on the file to prevent problems if the user
+    # uploads a read-only file.
+    chmod +w "${file_path}"
+
     #We must remove commas because CURL can't upload files with commas in the name
     # http://curl.haxx.se/mail/archive-2009-07/0029.html
     stripped_file_path=${file_path//','/''}