Merge branch 'saas-dev' into saas-dev-publishing

Conflicts:
	airtime_mvc/application/controllers/plugins/PageLayoutInitPlugin.php
	airtime_mvc/public/css/dashboard.css
	airtime_mvc/public/js/airtime/library/spl.js

airtime_mvc/public/js/airtime/common/audioplaytest.js

@@ -2,6 +2,10 @@
 function isAudioSupported(mime){
     var audio = new Audio();
 
+    if ((typeof mime) !== "string" || (mime === null)) {
+        return false;
+    }
+
     var bMime = null;
     if (mime.indexOf("ogg") != -1 || mime.indexOf("vorbis") != -1) {
        bMime = 'audio/ogg; codecs="vorbis"';