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/public/js/airtime/library/library.js

@@ -175,5 +175,5 @@ $(document).ready(function() {
         "oLanguage": {
             "sSearch": ""
         }
-	});
+	}).fnSetFilteringDelay(350);
 });