Merge branch 'saas-dev' into soundcloud

Conflicts:
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/public/js/airtime/preferences/preferences.js

airtime_mvc/application/configs/navigation.php

@@ -133,6 +133,11 @@ $pages = array(
                 'action'     => 'help',
                 'resource'   =>    'dashboard'
             ),
+            array(
+                'label'      => _('FAQ'),
+                'uri'        => "https://sourcefabricberlin.zendesk.com/hc/en-us/sections/200994309-Airtime-FAQ",
+                'target'     => "_blank"
+            ),
             array(
                 'label'      => _('User Manual'),
                 'uri'        => "http://sourcefabric.booktype.pro/airtime-pro-for-broadcasters",