Merge lp:~trb143/openlp/webfull into lp:openlp

[Tim Bentley]

This is getting to big to stay external any longer.
The web interface works with the existing HTML which has been externalised and can be pulled from OpenLP.

- Add new web and socket servers to API and replace all existing API's
- remove most of the Remote plugin but leave the base there to allow for the html and js code to land there.
- amend the FTW to download a package of html, JS and CSS and install in the remote directory
- add switch to turn off the servers to allow PyCharm to debug. It gets lost in threads if you do not!

Issues
The new UI String has gone wrong and not sure why
The FTW works fine for download but how should the Web Settings have a pop up as well?

It does work fine so have a play, you will need to run the FTW to install a set of web pages as they are missing.

Fixed up the issues Raoul brought up in the last review.

lp:~trb143/openlp/webfull (revision 2833)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2169/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/2074/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1962/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1332/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Test_Coverage/1169/
[SUCCESS] https://ci.openlp.io/job/Branch-04c-Code_Analysis2/299/
[FAILURE] https://ci.openlp.io/job/Branch-05-AppVeyor-Tests/142/

[Raoul Snyman (raoul-snyman)]

So, some thoughts around removing the web remote from OpenLP:

 - The remote plugin should handle the download and install of the web remote
 - The downloadable web remote should be versioned
 - OpenLP needs to be aware of the versions
 - Users should be able to check if there's a new version of the web remote
 - Users should be able to download an updated version of the web remote
 - Technically, the remote plugin should implement the old API
 - We should really make the new API RESTful, which means returning 400,
   500 and 200 status codes and not {"result": {"success": true}}

I'm going to write up more on the wiki about how I think the new API methods should look.

Also, see inline comments.

[Raoul Snyman (raoul-snyman)]

Oh, also, with the new web remote we won't need Mako or the translations because it'll be completely client-side.

[Raoul Snyman (raoul-snyman)]

So, I realised that the register_endpoint() method isn't helpful because if the modules are never imported the endpoint is never registered. What if we "moved" register_endpoint into the Plugin class?

[Tim Bentley (trb143)]

That could work.
A challenge with this is its size now and the time taken to stop getting it broken.
Due to time scales (renderer) it would be nice to get this in and work from within core code.

[Raoul Snyman (raoul-snyman)]

Sure. Let's try to get it working, especially with the current remotes, and then we're definitely closer to having a better solution.

[Raoul Snyman (raoul-snyman)]

I can always come in and refine it later.

[Tim Bentley (trb143)]

The current remote is packaged and will download and install with this code.
That needs a new truck to be created and defined but it allows the existing functionality to work.

[Raoul Snyman (raoul-snyman)]

Note: I haven't done a thorough code review. Let's get this in and start iterating.

review: Approve

=== modified file 'openlp/core/__init__.py'
--- openlp/core/__init__.py	2017-08-01 20:59:41 +0000
+++ openlp/core/__init__.py	2017-08-13 07:11:15 +0000
@@ -153,10 +153,8 @@
         self.processEvents()
         if not has_run_wizard:
             self.main_window.first_time()
-        # update_check = Settings().value('core/update check')
-        # if update_check:
-        #     version = VersionThread(self.main_window)
-        #     version.start()
+        version = VersionThread(self.main_window)
+        version.start()
         self.main_window.is_display_blank()
         self.main_window.app_startup()
         return self.exec()
@@ -337,6 +335,8 @@
     parser.add_argument('-d', '--dev-version', dest='dev_version', action='store_true',
                         help='Ignore the version file and pull the version directly from Bazaar')
     parser.add_argument('-s', '--style', dest='style', help='Set the Qt5 style (passed directly to Qt5).')
+    parser.add_argument('-w', '--no-web-server', dest='no_web_server', action='store_false',
+                        help='Turn off the Web and Socket Server ')
     parser.add_argument('rargs', nargs='?', default=[])
     # Parse command line options and deal with them. Use args supplied pragmatically if possible.
     return parser.parse_args(args) if args else parser.parse_args()
@@ -410,6 +410,7 @@
         set_up_logging(str(AppLocation.get_directory(AppLocation.CacheDir)))
     Registry.create()
     Registry().register('application', application)
+    Registry().set_flag('no_web_server', args.no_web_server)
     application.setApplicationVersion(get_application_version()['version'])
     # Check if an instance of OpenLP is already running. Quit if there is a running instance and the user only wants one
     if application.is_already_running():

=== added directory 'openlp/core/api'
=== added file 'openlp/core/api/__init__.py'
--- openlp/core/api/__init__.py	1970-01-01 00:00:00 +0000
+++ openlp/core/api/__init__.py	2017-08-13 07:11:15 +0000
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2017 OpenLP Developers                                   #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+
+from openlp.core.api.http.endpoint import Endpoint
+from openlp.core.api.http import register_endpoint, requires_auth
+from openlp.core.api.tab import ApiTab
+from openlp.core.api.poll import Poller
+
+__all__ = ['Endpoint', 'ApiTab', 'register_endpoint', 'requires_auth']

=== added directory 'openlp/core/api/endpoint'
=== added file 'openlp/core/api/endpoint/__init__.py'
--- openlp/core/api/endpoint/__init__.py	1970-01-01 00:00:00 +0000
+++ openlp/core/api/endpoint/__init__.py	2017-08-13 07:11:15 +0000
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2017 OpenLP Developers                                   #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+"""
+The Endpoint class, which provides plugins with a way to serve their own portion of the API
+"""
+from .pluginhelpers import search, live, service

=== added file 'openlp/core/api/endpoint/controller.py'
--- openlp/core/api/endpoint/controller.py	1970-01-01 00:00:00 +0000
+++ openlp/core/api/endpoint/controller.py	2017-08-13 07:11:15 +0000
@@ -0,0 +1,144 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2017 OpenLP Developers                                   #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+import logging
+import os
+import urllib.request
+import urllib.error
+import json
+
+from openlp.core.api.http.endpoint import Endpoint
+from openlp.core.api.http import requires_auth
+from openlp.core.common import Registry, AppLocation, Settings
+from openlp.core.lib import ItemCapabilities, create_thumb
+
+log = logging.getLogger(__name__)
+
+controller_endpoint = Endpoint('controller')
+api_controller_endpoint = Endpoint('api')
+
+
+@api_controller_endpoint.route('controller/live/text')
+@controller_endpoint.route('live/text')
+def controller_text(request):
+    """
+    Perform an action on the slide controller.
+
+    :param request: the http request - not used
+    """
+    log.debug("controller_text ")
+    live_controller = Registry().get('live_controller')
+    current_item = live_controller.service_item
+    data = []
+    if current_item:
+        for index, frame in enumerate(current_item.get_frames()):
+            item = {}
+            # Handle text (songs, custom, bibles)
+            if current_item.is_text():
+                if frame['verseTag']:
+                    item['tag'] = str(frame['verseTag'])
+                else:
+                    item['tag'] = str(index + 1)
+                item['chords_text'] = str(frame['chords_text'])
+                item['text'] = str(frame['text'])
+                item['html'] = str(frame['html'])
+            # Handle images, unless a custom thumbnail is given or if thumbnails is disabled
+            elif current_item.is_image() and not frame.get('image', '') and Settings().value('api/thumbnails'):
+                item['tag'] = str(index + 1)
+                thumbnail_path = os.path.join('images', 'thumbnails', frame['title'])
+                full_thumbnail_path = os.path.join(AppLocation.get_data_path(), thumbnail_path)
+                # Create thumbnail if it doesn't exists
+                if not os.path.exists(full_thumbnail_path):
+                    create_thumb(current_item.get_frame_path(index), full_thumbnail_path, False)
+                Registry().get('image_manager').add_image(full_thumbnail_path, frame['title'], None, 88, 88)
+                item['img'] = urllib.request.pathname2url(os.path.sep + thumbnail_path)
+                item['text'] = str(frame['title'])
+                item['html'] = str(frame['title'])
+            else:
+                # Handle presentation etc.
+                item['tag'] = str(index + 1)
+                if current_item.is_capable(ItemCapabilities.HasDisplayTitle):
+                    item['title'] = str(frame['display_title'])
+                if current_item.is_capable(ItemCapabilities.HasNotes):
+                    item['slide_notes'] = str(frame['notes'])
+                if current_item.is_capable(ItemCapabilities.HasThumbnails) and \
+                        Settings().value('api/thumbnails'):
+                    # If the file is under our app directory tree send the portion after the match
+                    data_path = AppLocation.get_data_path()
+                    if frame['image'][0:len(data_path)] == data_path:
+                        item['img'] = urllib.request.pathname2url(frame['image'][len(data_path):])
+                    Registry().get('image_manager').add_image(frame['image'], frame['title'], None, 88, 88)
+                item['text'] = str(frame['title'])
+                item['html'] = str(frame['title'])
+            item['selected'] = (live_controller.selected_row == index)
+            data.append(item)
+    json_data = {'results': {'slides': data}}
+    if current_item:
+        json_data['results']['item'] = live_controller.service_item.unique_identifier
+    return json_data
+
+
+@api_controller_endpoint.route('controller/live/set')
+@controller_endpoint.route('live/set')
+@requires_auth
+def controller_set(request):
+    """
+    Perform an action on the slide controller.
+
+    :param request: The action to perform.
+    """
+    event = getattr(Registry().get('live_controller'), 'slidecontroller_live_set')
+    try:
+        json_data = request.GET.get('data')
+        data = int(json.loads(json_data)['request']['id'])
+        event.emit([data])
+    except KeyError:
+        log.error("Endpoint controller/live/set request id not found")
+    return {'results': {'success': True}}
+
+
+@controller_endpoint.route('{action:next|previous}')
+@requires_auth
+def controller_direction(request, controller, action):
+    """
+    Handles requests for setting service items in the slide controller
+11
+    :param request: The http request object.
+    :param controller: the controller slides forward or backward.
+    :param action: the controller slides forward or backward.
+    """
+    event = getattr(Registry().get('live_controller'), 'slidecontroller_{controller}_{action}'.
+                    format(controller=controller, action=action))
+    event.emit()
+
+
+@api_controller_endpoint.route('controller/{controller}/{action:next|previous}')
+@requires_auth
+def controller_direction_api(request, controller, action):
+    """
+    Handles requests for setting service items in the slide controller
+11
+    :param request: The http request object.
+    :param controller: the controller slides forward or backward.
+    :param action: the controller slides forward or backward.
+    """
+    controller_direction(request, controller, action)
+    return {'results': {'success': True}}

=== added file 'openlp/core/api/endpoint/core.py'
--- openlp/core/api/endpoint/core.py	1970-01-01 00:00:00 +0000
+++ openlp/core/api/endpoint/core.py	2017-08-13 07:11:15 +0000
@@ -0,0 +1,182 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2017 OpenLP Developers                                   #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+import logging
+import os
+
+from openlp.core.api.http.endpoint import Endpoint
+from openlp.core.api.http import requires_auth
+from openlp.core.common import Registry, UiStrings, translate
+from openlp.core.lib import image_to_byte, PluginStatus, StringContent
+
+
+template_dir = 'templates'
+static_dir = 'static'
+blank_dir = os.path.join(static_dir, 'index')
+
+
+log = logging.getLogger(__name__)
+
+chords_endpoint = Endpoint('chords', template_dir=template_dir, static_dir=static_dir)
+stage_endpoint = Endpoint('stage', template_dir=template_dir, static_dir=static_dir)
+main_endpoint = Endpoint('main', template_dir=template_dir, static_dir=static_dir)
+blank_endpoint = Endpoint('', template_dir=template_dir, static_dir=blank_dir)
+
+FILE_TYPES = {
+    '.html': 'text/html',
+    '.css': 'text/css',
+    '.js': 'application/javascript',
+    '.jpg': 'image/jpeg',
+    '.gif': 'image/gif',
+    '.ico': 'image/x-icon',
+    '.png': 'image/png'
+}
+
+remote = translate('RemotePlugin.Mobile', 'Remote')
+stage = translate('RemotePlugin.Mobile', 'Stage View')
+live = translate('RemotePlugin.Mobile', 'Live View')
+chords = translate('RemotePlugin.Mobile', 'Chords View')
+
+TRANSLATED_STRINGS = {
+    'app_title': "{main} {remote}".format(main=UiStrings().OpenLP, remote=remote),
+    'stage_title': "{main} {stage}".format(main=UiStrings().OpenLP, stage=stage),
+    'live_title': "{main} {live}".format(main=UiStrings().OpenLP, live=live),
+    'chords_title': "{main} {chords}".format(main=UiStrings().OpenLP, chords=chords),
+    'service_manager': translate('RemotePlugin.Mobile', 'Service Manager'),
+    'slide_controller': translate('RemotePlugin.Mobile', 'Slide Controller'),
+    'alerts': translate('RemotePlugin.Mobile', 'Alerts'),
+    'search': translate('RemotePlugin.Mobile', 'Search'),
+    'home': translate('RemotePlugin.Mobile', 'Home'),
+    'refresh': translate('RemotePlugin.Mobile', 'Refresh'),
+    'blank': translate('RemotePlugin.Mobile', 'Blank'),
+    'theme': translate('RemotePlugin.Mobile', 'Theme'),
+    'desktop': translate('RemotePlugin.Mobile', 'Desktop'),
+    'show': translate('RemotePlugin.Mobile', 'Show'),
+    'prev': translate('RemotePlugin.Mobile', 'Prev'),
+    'next': translate('RemotePlugin.Mobile', 'Next'),
+    'text': translate('RemotePlugin.Mobile', 'Text'),
+    'show_alert': translate('RemotePlugin.Mobile', 'Show Alert'),
+    'go_live': translate('RemotePlugin.Mobile', 'Go Live'),
+    'add_to_service': translate('RemotePlugin.Mobile', 'Add to Service'),
+    'add_and_go_to_service': translate('RemotePlugin.Mobile', 'Add & Go to Service'),
+    'no_results': translate('RemotePlugin.Mobile', 'No Results'),
+    'options': translate('RemotePlugin.Mobile', 'Options'),
+    'service': translate('RemotePlugin.Mobile', 'Service'),
+    'slides': translate('RemotePlugin.Mobile', 'Slides'),
+    'settings': translate('RemotePlugin.Mobile', 'Settings'),
+}
+
+
+@stage_endpoint.route('')
+def stage_index(request):
+    """
+    Deliver the page for the /stage url
+    """
+    return stage_endpoint.render_template('stage.mako', **TRANSLATED_STRINGS)
+
+
+@chords_endpoint.route('')
+def chords_index(request):
+    """
+    Deliver the page for the /chords url
+    """
+    return chords_endpoint.render_template('chords.mako', **TRANSLATED_STRINGS)
+
+
+@main_endpoint.route('')
+def main_index(request):
+    """
+    Deliver the page for the /main url
+    """
+    return main_endpoint.render_template('main.mako', **TRANSLATED_STRINGS)
+
+
+@blank_endpoint.route('')
+def index(request):
+    """
+    Deliver the page for the / url
+    :param request:
+    """
+    return blank_endpoint.render_template('index.mako', **TRANSLATED_STRINGS)
+
+
+@blank_endpoint.route('api/poll')
+@blank_endpoint.route('poll')
+def poll(request):
+    """
+    Deliver the page for the /poll url
+
+    :param request:
+    """
+    return Registry().get('poller').poll()
+
+
+@blank_endpoint.route('api/display/{display:hide|show|blank|theme|desktop}')
+@blank_endpoint.route('display/{display:hide|show|blank|theme|desktop}')
+@requires_auth
+def toggle_display(request, display):
+    """
+    Deliver the functions for the /display url
+    :param request: the http request - not used
+    :param display: the display function to be triggered
+    """
+    Registry().get('live_controller').slidecontroller_toggle_display.emit(display)
+    return {'results': {'success': True}}
+
+
+@blank_endpoint.route('api/plugin/search')
+@blank_endpoint.route('plugin/search')
+def plugin_search_list(request):
+    """
+    Deliver a list of active plugins that support search
+    :param request: the http request - not used
+    """
+    searches = []
+    for plugin in Registry().get('plugin_manager').plugins:
+        if plugin.status == PluginStatus.Active and plugin.media_item and plugin.media_item.has_search:
+            searches.append([plugin.name, str(plugin.text_strings[StringContent.Name]['plural'])])
+    return {'results': {'items': searches}}
+
+
+@main_endpoint.route('image')
+def main_image(request):
+    """
+    Return the latest display image as a byte stream.
+    :param request: base path of the URL. Not used but passed by caller
+    :return:
+    """
+    live_controller = Registry().get('live_controller')
+    result = {
+        'slide_image': 'data:image/png;base64,' + str(image_to_byte(live_controller.slide_image))
+    }
+    return {'results': result}
+
+
+def get_content_type(file_name):
+    """
+    Examines the extension of the file and determines what the content_type should be, defaults to text/plain
+    Returns the extension and the content_type
+
+    :param file_name: name of file
+    """
+    ext = os.path.splitext(file_name)[1]
+    content_type = FILE_TYPES.get(ext, 'text/plain')
+    return ext, content_type

=== added file 'openlp/core/api/endpoint/pluginhelpers.py'
--- openlp/core/api/endpoint/pluginhelpers.py	1970-01-01 00:00:00 +0000
+++ openlp/core/api/endpoint/pluginhelpers.py	2017-08-13 07:11:15 +0000
@@ -0,0 +1,138 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2017 OpenLP Developers                                   #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+import os
+import json
+import re
+import urllib
+
+from urllib.parse import urlparse
+from webob import Response
+
+from openlp.core.api.http.errors import NotFound
+from openlp.core.common import Registry, AppLocation
+from openlp.core.lib import PluginStatus, image_to_byte
+
+
+def search(request, plugin_name, log):
+    """
+    Handles requests for searching the plugins
+
+    :param request: The http request object.
+    :param plugin_name: The plugin name.
+    :param log: The class log object.
+    """
+    try:
+        json_data = request.GET.get('data')
+        text = json.loads(json_data)['request']['text']
+    except KeyError:
+        log.error("Endpoint {text} search request text not found".format(text=plugin_name))
+        text = ""
+    text = urllib.parse.unquote(text)
+    plugin = Registry().get('plugin_manager').get_plugin_by_name(plugin_name)
+    if plugin.status == PluginStatus.Active and plugin.media_item and plugin.media_item.has_search:
+        results = plugin.media_item.search(text, False)
+        return {'results': {'items': results}}
+    else:
+        raise NotFound()
+
+
+def live(request, plugin_name, log):
+    """
+    Handles requests for making live of the plugins
+
+    :param request: The http request object.
+    :param plugin_name: The plugin name.
+    :param log: The class log object.
+    """
+    try:
+        json_data = request.GET.get('data')
+        request_id = json.loads(json_data)['request']['id']
+    except KeyError:
+        log.error("Endpoint {text} search request text not found".format(text=plugin_name))
+        return []
+    plugin = Registry().get('plugin_manager').get_plugin_by_name(plugin_name)
+    if plugin.status == PluginStatus.Active and plugin.media_item:
+        getattr(plugin.media_item, '{name}_go_live'.format(name=plugin_name)).emit([request_id, True])
+
+
+def service(request, plugin_name, log):
+    """
+    Handles requests for adding to a service of the plugins
+
+    :param request: The http request object.
+    :param plugin_name: The plugin name.
+    :param log: The class log object.
+    """
+    try:
+        json_data = request.GET.get('data')
+        request_id = json.loads(json_data)['request']['id']
+    except KeyError:
+        log.error("Endpoint {plugin} search request text not found".format(plugin=plugin_name))
+        return []
+    plugin = Registry().get('plugin_manager').get_plugin_by_name(plugin_name)
+    if plugin.status == PluginStatus.Active and plugin.media_item:
+        item_id = plugin.media_item.create_item_from_id(request_id)
+        getattr(plugin.media_item, '{name}_add_to_service'.format(name=plugin_name)).emit([item_id, True])
+
+
+def display_thumbnails(request, controller_name, log, dimensions, file_name, slide=None):
+    """
+    Handles requests for adding a song to the service
+
+    Return an image to a web page based on a URL
+    :param request: Request object
+    :param controller_name: which controller is requesting the image
+    :param log: the logger object
+    :param dimensions: the image size eg 88x88
+    :param file_name: the file name of the image
+    :param slide: the individual image name
+    :return:
+    """
+    log.debug('serve thumbnail {cname}/thumbnails{dim}/{fname}/{slide}'.format(cname=controller_name,
+                                                                               dim=dimensions,
+                                                                               fname=file_name,
+                                                                               slide=slide))
+    # -1 means use the default dimension in ImageManager
+    width = -1
+    height = -1
+    image = None
+    if dimensions:
+        match = re.search('(\d+)x(\d+)', dimensions)
+        if match:
+            # let's make sure that the dimensions are within reason
+            width = sorted([10, int(match.group(1)), 1000])[1]
+            height = sorted([10, int(match.group(2)), 1000])[1]
+    if controller_name and file_name:
+        file_name = urllib.parse.unquote(file_name)
+        if '..' not in file_name:  # no hacking please
+            if slide:
+                full_path = os.path.normpath(os.path.join(AppLocation.get_section_data_path(controller_name),
+                                                          'thumbnails', file_name, slide))
+            else:
+                full_path = os.path.normpath(os.path.join(AppLocation.get_section_data_path(controller_name),
+
+                                                          'thumbnails', file_name))
+            if os.path.exists(full_path):
+                path, just_file_name = os.path.split(full_path)
+                Registry().get('image_manager').add_image(full_path, just_file_name, None, width, height)
+                image = Registry().get('image_manager').get_image(full_path, just_file_name, width, height)
+    return Response(body=image_to_byte(image, False), status=200, content_type='image/png', charset='utf8')

=== added file 'openlp/core/api/endpoint/service.py'
--- openlp/core/api/endpoint/service.py	1970-01-01 00:00:00 +0000
+++ openlp/core/api/endpoint/service.py	2017-08-13 07:11:15 +0000
@@ -0,0 +1,100 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2017 OpenLP Developers                                   #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+import logging
+import json
+
+from openlp.core.api.http.endpoint import Endpoint
+from openlp.core.api.http import register_endpoint, requires_auth
+from openlp.core.common import Registry
+
+
+log = logging.getLogger(__name__)
+
+service_endpoint = Endpoint('service')
+api_service_endpoint = Endpoint('api/service')
+
+
+@api_service_endpoint.route('list')
+@service_endpoint.route('list')
+def list_service(request):
+    """
+    Handles requests for service items in the service manager
+
+    :param request: The http request object.
+    """
+    return {'results': {'items': get_service_items()}}
+
+
+@api_service_endpoint.route('set')
+@service_endpoint.route('set')
+@requires_auth
+def service_set(request):
+    """
+    Handles requests for setting service items in the service manager
+
+    :param request: The http request object.
+    """
+    event = getattr(Registry().get('service_manager'), 'servicemanager_set_item')
+    try:
+        json_data = request.GET.get('data')
+        data = int(json.loads(json_data)['request']['id'])
+        event.emit(data)
+    except KeyError:
+        log.error("Endpoint service/set request id not found")
+    return {'results': {'success': True}}
+
+
+@api_service_endpoint.route('{action:next|previous}')
+@service_endpoint.route('{action:next|previous}')
+@requires_auth
+def service_direction(request, action):
+    """
+    Handles requests for setting service items in the service manager
+
+    :param request: The http request object.
+    :param action: the the service slides forward or backward.
+    """
+    event = getattr(Registry().get('service_manager'), 'servicemanager_{action}_item'.format(action=action))
+    event.emit()
+    return {'results': {'success': True}}
+
+
+def get_service_items():
+    """
+    Read the service item in use and return the data as a json object
+    """
+    live_controller = Registry().get('live_controller')
+    service_items = []
+    if live_controller.service_item:
+        current_unique_identifier = live_controller.service_item.unique_identifier
+    else:
+        current_unique_identifier = None
+    for item in Registry().get('service_manager').service_items:
+        service_item = item['service_item']
+        service_items.append({
+            'id': str(service_item.unique_identifier),
+            'title': str(service_item.get_display_title()),
+            'plugin': str(service_item.name),
+            'notes': str(service_item.notes),
+            'selected': (service_item.unique_identifier == current_unique_identifier)
+        })
+    return service_items

=== added directory 'openlp/core/api/http'
=== added file 'openlp/core/api/http/__init__.py'
--- openlp/core/api/http/__init__.py	1970-01-01 00:00:00 +0000
+++ openlp/core/api/http/__init__.py	2017-08-13 07:11:15 +0000
@@ -0,0 +1,110 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2017 OpenLP Developers                                   #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+
+import base64
+from functools import wraps
+from webob import Response
+
+from openlp.core.common.settings import Settings
+from openlp.core.api.http.wsgiapp import WSGIApplication
+from .errors import NotFound, ServerError, HttpError
+
+application = WSGIApplication('api')
+
+
+def _route_from_url(url_prefix, url):
+    """
+    Create a route from the URL
+    """
+    url_prefix = '/{prefix}/'.format(prefix=url_prefix.strip('/'))
+    if not url:
+        url = url_prefix[:-1]
+    else:
+        url = url_prefix + url
+    url = url.replace('//', '/')
+    return url
+
+
+def register_endpoint(end_point):
+    """
+    Register an endpoint with the app
+    """
+    for url, view_func, method in end_point.routes:
+        # Set the view functions
+        route = _route_from_url(end_point.url_prefix, url)
+        application.add_route(route, view_func, method)
+        # Add a static route if necessary
+        if end_point.static_dir:
+            static_route = _route_from_url(end_point.url_prefix, 'static')
+            static_route += '(.*)'
+            application.add_static_route(static_route, end_point.static_dir)
+
+
+def check_auth(auth):
+    """
+    This function is called to check if a username password combination is valid.
+
+    :param auth: the authorisation object which needs to be tested
+    :return Whether authentication have been successful
+    """
+    auth_code = "{user}:{password}".format(user=Settings().value('api/user id'),
+                                           password=Settings().value('api/password'))
+    try:
+        auth_base = base64.b64encode(auth_code)
+    except TypeError:
+        auth_base = base64.b64encode(auth_code.encode()).decode()
+    if auth[1] == auth_base:
+        return True
+    else:
+        return False
+
+
+def authenticate():
+    """
+    Sends a 401 response that enables basic auth to be triggered
+    """
+    resp = Response(status=401)
+    resp.www_authenticate = 'Basic realm="OpenLP Login Required"'
+    return resp
+
+
+def requires_auth(f):
+    """
+    Decorates a function which needs to be authenticated before it can be used from the remote.
+
+    :param f: The function which has been wrapped
+    :return: the called function or a request to authenticate
+    """
+    @wraps(f)
+    def decorated(*args, **kwargs):
+        if not Settings().value('api/authentication enabled'):
+            return f(*args, **kwargs)
+        req = args[0]
+        if not hasattr(req, 'authorization'):
+            return authenticate()
+        else:
+            auth = req.authorization
+            if auth and check_auth(auth):
+                return f(*args, **kwargs)
+            else:
+                return authenticate()
+    return decorated

=== added file 'openlp/core/api/http/endpoint.py'
--- openlp/core/api/http/endpoint.py	1970-01-01 00:00:00 +0000
+++ openlp/core/api/http/endpoint.py	2017-08-13 07:11:15 +0000
@@ -0,0 +1,80 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2017 OpenLP Developers                                   #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+"""
+The Endpoint class, which provides plugins with a way to serve their own portion of the API
+"""
+
+import os
+
+from openlp.core.common import AppLocation
+from mako.template import Template
+
+
+class Endpoint(object):
+    """
+    This is an endpoint for the HTTP API
+    """
+    def __init__(self, url_prefix, template_dir=None, static_dir=None, assets_dir=None):
+        """
+        Create an endpoint with a URL prefix
+        """
+        self.url_prefix = url_prefix
+        self.static_dir = static_dir
+        self.template_dir = template_dir
+        if assets_dir:
+            self.assets_dir = assets_dir
+        else:
+            self.assets_dir = None
+        self.routes = []
+
+    def add_url_route(self, url, view_func, method):
+        """
+        Add a url route to the list of routes
+        """
+        self.routes.append((url, view_func, method))
+
+    def route(self, rule, method='GET'):
+        """
+        Set up a URL route
+        """
+        def decorator(func):
+            """
+            Make this a decorator
+            """
+            self.add_url_route(rule, func, method)
+            return func
+        return decorator
+
+    def render_template(self, filename, **kwargs):
+        """
+        Render a mako template
+        """
+        root = os.path.join(str(AppLocation.get_section_data_path('remotes')))
+        if not self.template_dir:
+            raise Exception('No template directory specified')
+        path = os.path.join(root, self.template_dir, filename)
+        # path = os.path.abspath(os.path.join(self.template_dir, filename))
+        if self.static_dir:
+            kwargs['static_url'] = '/{prefix}/static'.format(prefix=self.url_prefix)
+            kwargs['static_url'] = kwargs['static_url'].replace('//', '/')
+        kwargs['assets_url'] = '/assets'
+        return Template(filename=path, input_encoding='utf-8').render(**kwargs)

=== added file 'openlp/core/api/http/errors.py'
--- openlp/core/api/http/errors.py	1970-01-01 00:00:00 +0000
+++ openlp/core/api/http/errors.py	2017-08-13 07:11:15 +0000
@@ -0,0 +1,65 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2017 OpenLP Developers                                   #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+"""
+HTTP Error classes
+"""
+
+
+class HttpError(Exception):
+    """
+    A base HTTP error (aka status code)
+    """
+    def __init__(self, status, message):
+        """
+        Initialise the exception
+        """
+        super(HttpError, self).__init__(message)
+        self.status = status
+        self.message = message
+
+    def to_response(self):
+        """
+        Convert this exception to a Response object
+        """
+        return self.message, self.status
+
+
+class NotFound(HttpError):
+    """
+    A 404
+    """
+    def __init__(self):
+        """
+        Make this a 404
+        """
+        super(NotFound, self).__init__(404, 'Not Found')
+
+
+class ServerError(HttpError):
+    """
+    A 500
+    """
+    def __init__(self):
+        """
+        Make this a 500
+        """
+        super(ServerError, self).__init__(500, 'Server Error')

=== added file 'openlp/core/api/http/server.py'
--- openlp/core/api/http/server.py	1970-01-01 00:00:00 +0000
+++ openlp/core/api/http/server.py	2017-08-13 07:11:15 +0000
@@ -0,0 +1,97 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2017 OpenLP Developers                                   #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+
+"""
+The :mod:`http` module contains the API web server. This is a lightweight web server used by remotes to interact
+with OpenLP. It uses JSON to communicate with the remotes.
+"""
+
+import logging
+
+from PyQt5 import QtCore
+from waitress import serve
+
+from openlp.core.api.http import register_endpoint
+from openlp.core.api.http import application
+from openlp.core.common import RegistryMixin, RegistryProperties, OpenLPMixin, Settings, Registry
+from openlp.core.api.poll import Poller
+from openlp.core.api.endpoint.controller import controller_endpoint, api_controller_endpoint
+from openlp.core.api.endpoint.core import chords_endpoint, stage_endpoint, blank_endpoint, main_endpoint
+from openlp.core.api.endpoint.service import service_endpoint, api_service_endpoint
+
+log = logging.getLogger(__name__)
+
+
+class HttpWorker(QtCore.QObject):
+    """
+    A special Qt thread class to allow the HTTP server to run at the same time as the UI.
+    """
+    def __init__(self):
+        """
+        Constructor for the thread class.
+
+        :param server: The http server class.
+        """
+        super(HttpWorker, self).__init__()
+
+    def run(self):
+        """
+        Run the thread.
+        """
+        address = Settings().value('api/ip address')
+        port = Settings().value('api/port')
+        serve(application, host=address, port=port)
+
+    def stop(self):
+        pass
+
+
+class HttpServer(RegistryMixin, RegistryProperties, OpenLPMixin):
+    """
+    Wrapper round a server instance
+    """
+    def __init__(self, parent=None):
+        """
+        Initialise the http server, and start the http server
+        """
+        super(HttpServer, self).__init__(parent)
+        self.worker = HttpWorker()
+        self.thread = QtCore.QThread()
+        self.worker.moveToThread(self.thread)
+        self.thread.started.connect(self.worker.run)
+        self.thread.start()
+
+    def bootstrap_post_set_up(self):
+        """
+        Register the poll return service and start the servers.
+        """
+        self.poller = Poller()
+        Registry().register('poller', self.poller)
+        application.initialise()
+        register_endpoint(controller_endpoint)
+        register_endpoint(api_controller_endpoint)
+        register_endpoint(chords_endpoint)
+        register_endpoint(stage_endpoint)
+        register_endpoint(blank_endpoint)
+        register_endpoint(main_endpoint)
+        register_endpoint(service_endpoint)
+        register_endpoint(api_service_endpoint)

=== added file 'openlp/core/api/http/wsgiapp.py'
--- openlp/core/api/http/wsgiapp.py	1970-01-01 00:00:00 +0000
+++ openlp/core/api/http/wsgiapp.py	2017-08-13 07:11:15 +0000
@@ -0,0 +1,181 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+# pylint: disable=logging-format-interpolation
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2017 OpenLP Developers                                   #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+"""
+App stuff
+"""
+import json
+import logging
+import os
+import re
+
+from webob import Request, Response
+from webob.static import DirectoryApp
+
+from openlp.core.common import AppLocation
+from openlp.core.api.http.errors import HttpError, NotFound, ServerError
+
+
+ARGS_REGEX = re.compile(r'''\{(\w+)(?::([^}]+))?\}''', re.VERBOSE)
+
+log = logging.getLogger(__name__)
+
+
+def _route_to_regex(route):
+    """
+    Convert a route to a regular expression
+
+    For example:
+
+      'songs/{song_id}' becomes 'songs/(?P<song_id>[^/]+)'
+
+    and
+
+      'songs/{song_id:\d+}' becomes 'songs/(?P<song_id>\d+)'
+
+    """
+    route_regex = ''
+    last_pos = 0
+    for match in ARGS_REGEX.finditer(route):
+        route_regex += re.escape(route[last_pos:match.start()])
+        arg_name = match.group(1)
+        expr = match.group(2) or '[^/]+'
+        expr = '(?P<%s>%s)' % (arg_name, expr)
+        route_regex += expr
+        last_pos = match.end()
+    route_regex += re.escape(route[last_pos:])
+    route_regex = '^%s$' % route_regex
+    return route_regex
+
+
+def _make_response(view_result):
+    """
+    Create a Response object from response
+    """
+    if isinstance(view_result, Response):
+        return view_result
+    elif isinstance(view_result, tuple):
+        content_type = 'text/html'
+        body = view_result[0]
+        if isinstance(body, dict):
+            content_type = 'application/json'
+            body = json.dumps(body)
+        response = Response(body=body, status=view_result[1],
+                            content_type=content_type, charset='utf8')
+        if len(view_result) >= 3:
+            response.headers.update(view_result[2])
+        return response
+    elif isinstance(view_result, dict):
+        return Response(body=json.dumps(view_result), status=200,
+                        content_type='application/json', charset='utf8')
+    elif isinstance(view_result, str):
+        return Response(body=view_result, status=200,
+                        content_type='text/html', charset='utf8')
+
+
+def _handle_exception(error):
+    """
+    Handle exceptions
+    """
+    log.exception(error)
+    if isinstance(error, HttpError):
+        return error.to_response()
+    else:
+        return ServerError().to_response()
+
+
+class WSGIApplication(object):
+    """
+    This is the core of the API, the WSGI app
+    """
+    def __init__(self, name):
+        """
+        Create the app object
+        """
+        self.name = name
+        self.static_routes = {}
+        self.route_map = {}
+
+    def initialise(self):
+        """
+        Set up generic roots for the whole application
+        :return: None
+        """
+        self.add_static_route('/assets(.*)', '')
+        self.add_static_route('/images(.*)', '')
+        pass
+
+    def add_route(self, route, view_func, method):
+        """
+        Add a route
+        """
+        route_regex = _route_to_regex(route)
+        if route_regex not in self.route_map:
+            self.route_map[route_regex] = {}
+        self.route_map[route_regex][method.upper()] = view_func
+
+    def add_static_route(self, route, static_dir):
+        """
+        Add a static directory as a route
+        """
+        if route not in self.static_routes:
+            root = os.path.join(str(AppLocation.get_section_data_path('remotes')))
+            self.static_routes[route] = DirectoryApp(os.path.abspath(os.path.join(root, static_dir)))
+
+    def dispatch(self, request):
+        """
+        Find the appropriate URL and run the view function
+        """
+        # If not a static route, try the views
+        for route, views in self.route_map.items():
+            match = re.match(route, request.path)
+            if match and request.method.upper() in views:
+                kwargs = match.groupdict()
+                log.debug('Found {method} {url}'.format(method=request.method, url=request.path))
+                view_func = views[request.method.upper()]
+                return _make_response(view_func(request, **kwargs))
+        # Look to see if this is a static file request
+        for route, static_app in self.static_routes.items():
+            if re.match(route, request.path):
+                return request.get_response(static_app)
+        log.error('URL {url} - Not found'.format(url=request.path))
+        raise NotFound()
+
+    def wsgi_app(self, environ, start_response):
+        """
+        The actual WSGI application.
+        """
+        request = Request(environ)
+        try:
+            response = self.dispatch(request)
+        except Exception as e:
+            response = _make_response(_handle_exception(e))
+        response.headers.add("cache-control", "no-cache, no-store, must-revalidate")
+        response.headers.add("pragma", "no-cache")
+        response.headers.add("expires", "0")
+        return response(environ, start_response)
+
+    def __call__(self, environ, start_response):
+        """
+        Shortcut for wsgi_app.
+        """
+        return self.wsgi_app(environ, start_response)

=== added file 'openlp/core/api/poll.py'
--- openlp/core/api/poll.py	1970-01-01 00:00:00 +0000
+++ openlp/core/api/poll.py	2017-08-13 07:11:15 +0000
@@ -0,0 +1,130 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2017 OpenLP Developers                                   #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+
+import json
+
+from openlp.core.common import RegistryProperties, Settings
+from openlp.core.common.httputils import get_web_page
+
+
+class Poller(RegistryProperties):
+    """
+    Accessed by the web layer to get status type information from the application
+    """
+    def __init__(self):
+        """
+        Constructor for the poll builder class.
+        """
+        super(Poller, self).__init__()
+        self.live_cache = None
+        self.stage_cache = None
+        self.chords_cache = None
+
+    def raw_poll(self):
+        return {
+            'service': self.service_manager.service_id,
+            'slide': self.live_controller.selected_row or 0,
+            'item': self.live_controller.service_item.unique_identifier if self.live_controller.service_item else '',
+            'twelve': Settings().value('api/twelve hour'),
+            'blank': self.live_controller.blank_screen.isChecked(),
+            'theme': self.live_controller.theme_screen.isChecked(),
+            'display': self.live_controller.desktop_screen.isChecked(),
+            'version': 3,
+            'isSecure': Settings().value('api/authentication enabled'),
+            'isAuthorised': False,
+            'chordNotation': Settings().value('songs/chord notation'),
+            'isStagedActive': self.is_stage_active(),
+            'isLiveActive': self.is_live_active(),
+            'isChordsActive': self.is_chords_active()
+        }
+
+    def poll(self):
+        """
+        Poll OpenLP to determine the current slide number and item name.
+        """
+        return {'results': self.raw_poll()}
+
+    def main_poll(self):
+        """
+        Poll OpenLP to determine the current slide count.
+        """
+        result = {
+            'slide_count': self.live_controller.slide_count
+        }
+        return json.dumps({'results': result}).encode()
+
+    def reset_cache(self):
+        """
+        Reset the caches as the web has changed
+        :return:
+        """
+        self.stage_cache = None
+        self.live_cache = None
+        self.chords.cache = None
+
+    def is_stage_active(self):
+        """
+        Is stage active - call it and see but only once
+        :return: if stage is active or not
+        """
+        if self.stage_cache is None:
+            try:
+                page = get_web_page("http://localhost:4316/stage")
+            except:
+                page = None
+            if page:
+                self.stage_cache = True
+            else:
+                self.stage_cache = False
+        return self.stage_cache
+
+    def is_live_active(self):
+        """
+        Is main active - call it and see but only once
+        :return: if live is active or not
+        """
+        if self.live_cache is None:
+            try:
+                page = get_web_page("http://localhost:4316/main")
+            except:
+                page = None
+            if page:
+                self.live_cache = True
+            else:
+                self.live_cache = False
+        return self.live_cache
+
+    def is_chords_active(self):
+        """
+        Is chords active - call it and see but only once
+        :return: if live is active or not
+        """
+        if self.chords_cache is None:
+            try:
+                page = get_web_page("http://localhost:4316/chords")
+            except:
+                page = None
+            if page:
+                self.chords_cache = True
+            else:
+                self.chords_cache = False
+        return self.chords_cache

=== added file 'openlp/core/api/tab.py'
--- openlp/core/api/tab.py	1970-01-01 00:00:00 +0000
+++ openlp/core/api/tab.py	2017-08-13 07:11:15 +0000
@@ -0,0 +1,316 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2017 OpenLP Developers                                   #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+
+from PyQt5 import QtCore, QtGui, QtNetwork, QtWidgets
+
+from openlp.core.common import UiStrings, Registry, Settings, translate
+from openlp.core.lib import SettingsTab
+
+ZERO_URL = '0.0.0.0'
+
+
+class ApiTab(SettingsTab):
+    """
+    RemoteTab is the Remotes settings tab in the settings dialog.
+    """
+    def __init__(self, parent):
+        self.icon_path = ':/plugins/plugin_remote.png'
+        advanced_translated = translate('OpenLP.AdvancedTab', 'Advanced')
+        super(ApiTab, self).__init__(parent, 'api', advanced_translated)
+        self.define_main_window_icon()
+        self.generate_icon()
+
+    def setupUi(self):
+        self.setObjectName('ApiTab')
+        super(ApiTab, self).setupUi()
+        self.server_settings_group_box = QtWidgets.QGroupBox(self.left_column)
+        self.server_settings_group_box.setObjectName('server_settings_group_box')
+        self.server_settings_layout = QtWidgets.QFormLayout(self.server_settings_group_box)
+        self.server_settings_layout.setObjectName('server_settings_layout')
+        self.address_label = QtWidgets.QLabel(self.server_settings_group_box)
+        self.address_label.setObjectName('address_label')
+        self.address_edit = QtWidgets.QLineEdit(self.server_settings_group_box)
+        self.address_edit.setSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        self.address_edit.setValidator(QtGui.QRegExpValidator(QtCore.QRegExp('\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}'),
+                                       self))
+        self.address_edit.setObjectName('address_edit')
+        self.server_settings_layout.addRow(self.address_label, self.address_edit)
+        self.twelve_hour_check_box = QtWidgets.QCheckBox(self.server_settings_group_box)
+        self.twelve_hour_check_box.setObjectName('twelve_hour_check_box')
+        self.server_settings_layout.addRow(self.twelve_hour_check_box)
+        self.thumbnails_check_box = QtWidgets.QCheckBox(self.server_settings_group_box)
+        self.thumbnails_check_box.setObjectName('thumbnails_check_box')
+        self.server_settings_layout.addRow(self.thumbnails_check_box)
+        self.left_layout.addWidget(self.server_settings_group_box)
+        self.http_settings_group_box = QtWidgets.QGroupBox(self.left_column)
+        self.http_settings_group_box.setObjectName('http_settings_group_box')
+        self.http_setting_layout = QtWidgets.QFormLayout(self.http_settings_group_box)
+        self.http_setting_layout.setObjectName('http_setting_layout')
+        self.port_label = QtWidgets.QLabel(self.http_settings_group_box)
+        self.port_label.setObjectName('port_label')
+        self.port_spin_box = QtWidgets.QLabel(self.http_settings_group_box)
+        self.port_spin_box.setObjectName('port_spin_box')
+        self.http_setting_layout.addRow(self.port_label, self.port_spin_box)
+        self.remote_url_label = QtWidgets.QLabel(self.http_settings_group_box)
+        self.remote_url_label.setObjectName('remote_url_label')
+        self.remote_url = QtWidgets.QLabel(self.http_settings_group_box)
+        self.remote_url.setObjectName('remote_url')
+        self.remote_url.setOpenExternalLinks(True)
+        self.http_setting_layout.addRow(self.remote_url_label, self.remote_url)
+        self.stage_url_label = QtWidgets.QLabel(self.http_settings_group_box)
+        self.stage_url_label.setObjectName('stage_url_label')
+        self.stage_url = QtWidgets.QLabel(self.http_settings_group_box)
+        self.stage_url.setObjectName('stage_url')
+        self.stage_url.setOpenExternalLinks(True)
+        self.http_setting_layout.addRow(self.stage_url_label, self.stage_url)
+        self.chords_url_label = QtWidgets.QLabel(self.http_settings_group_box)
+        self.chords_url_label.setObjectName('chords_url_label')
+        self.chords_url = QtWidgets.QLabel(self.http_settings_group_box)
+        self.chords_url.setObjectName('chords_url')
+        self.chords_url.setOpenExternalLinks(True)
+        self.http_setting_layout.addRow(self.chords_url_label, self.chords_url)
+        self.live_url_label = QtWidgets.QLabel(self.http_settings_group_box)
+        self.live_url_label.setObjectName('live_url_label')
+        self.live_url = QtWidgets.QLabel(self.http_settings_group_box)
+        self.live_url.setObjectName('live_url')
+        self.live_url.setOpenExternalLinks(True)
+        self.http_setting_layout.addRow(self.live_url_label, self.live_url)
+        self.left_layout.addWidget(self.http_settings_group_box)
+        self.user_login_group_box = QtWidgets.QGroupBox(self.left_column)
+        self.user_login_group_box.setCheckable(True)
+        self.user_login_group_box.setChecked(False)
+        self.user_login_group_box.setObjectName('user_login_group_box')
+        self.user_login_layout = QtWidgets.QFormLayout(self.user_login_group_box)
+        self.user_login_layout.setObjectName('user_login_layout')
+        self.user_id_label = QtWidgets.QLabel(self.user_login_group_box)
+        self.user_id_label.setObjectName('user_id_label')
+        self.user_id = QtWidgets.QLineEdit(self.user_login_group_box)
+        self.user_id.setObjectName('user_id')
+        self.user_login_layout.addRow(self.user_id_label, self.user_id)
+        self.password_label = QtWidgets.QLabel(self.user_login_group_box)
+        self.password_label.setObjectName('password_label')
+        self.password = QtWidgets.QLineEdit(self.user_login_group_box)
+        self.password.setObjectName('password')
+        self.user_login_layout.addRow(self.password_label, self.password)
+        self.left_layout.addWidget(self.user_login_group_box)
+        self.update_site_group_box = QtWidgets.QGroupBox(self.left_column)
+        self.update_site_group_box.setCheckable(True)
+        self.update_site_group_box.setChecked(False)
+        self.update_site_group_box.setObjectName('update_site_group_box')
+        self.update_site_layout = QtWidgets.QFormLayout(self.update_site_group_box)
+        self.update_site_layout.setObjectName('update_site_layout')
+        self.current_version_label = QtWidgets.QLabel(self.update_site_group_box)
+        self.current_version_label.setObjectName('current_version_label')
+        self.current_version_value = QtWidgets.QLabel(self.update_site_group_box)
+        self.current_version_value.setObjectName('current_version_value')
+        self.update_site_layout.addRow(self.current_version_label, self.current_version_value)
+        self.master_version_label = QtWidgets.QLabel(self.update_site_group_box)
+        self.master_version_label.setObjectName('master_version_label')
+        self.master_version_value = QtWidgets.QLabel(self.update_site_group_box)
+        self.master_version_value.setObjectName('master_version_value')
+        self.update_site_layout.addRow(self.master_version_label, self.master_version_value)
+        self.left_layout.addWidget(self.update_site_group_box)
+        self.android_app_group_box = QtWidgets.QGroupBox(self.right_column)
+        self.android_app_group_box.setObjectName('android_app_group_box')
+        self.right_layout.addWidget(self.android_app_group_box)
+        self.android_qr_layout = QtWidgets.QVBoxLayout(self.android_app_group_box)
+        self.android_qr_layout.setObjectName('android_qr_layout')
+        self.android_qr_code_label = QtWidgets.QLabel(self.android_app_group_box)
+        self.android_qr_code_label.setPixmap(QtGui.QPixmap(':/remotes/android_app_qr.png'))
+        self.android_qr_code_label.setAlignment(QtCore.Qt.AlignCenter)
+        self.android_qr_code_label.setObjectName('android_qr_code_label')
+        self.android_qr_layout.addWidget(self.android_qr_code_label)
+        self.android_qr_description_label = QtWidgets.QLabel(self.android_app_group_box)
+        self.android_qr_description_label.setObjectName('android_qr_description_label')
+        self.android_qr_description_label.setOpenExternalLinks(True)
+        self.android_qr_description_label.setWordWrap(True)
+        self.android_qr_layout.addWidget(self.android_qr_description_label)
+        self.ios_app_group_box = QtWidgets.QGroupBox(self.right_column)
+        self.ios_app_group_box.setObjectName('ios_app_group_box')
+        self.right_layout.addWidget(self.ios_app_group_box)
+        self.ios_qr_layout = QtWidgets.QVBoxLayout(self.ios_app_group_box)
+        self.ios_qr_layout.setObjectName('ios_qr_layout')
+        self.ios_qr_code_label = QtWidgets.QLabel(self.ios_app_group_box)
+        self.ios_qr_code_label.setPixmap(QtGui.QPixmap(':/remotes/ios_app_qr.png'))
+        self.ios_qr_code_label.setAlignment(QtCore.Qt.AlignCenter)
+        self.ios_qr_code_label.setObjectName('ios_qr_code_label')
+        self.ios_qr_layout.addWidget(self.ios_qr_code_label)
+        self.ios_qr_description_label = QtWidgets.QLabel(self.ios_app_group_box)
+        self.ios_qr_description_label.setObjectName('ios_qr_description_label')
+        self.ios_qr_description_label.setOpenExternalLinks(True)
+        self.ios_qr_description_label.setWordWrap(True)
+        self.ios_qr_layout.addWidget(self.ios_qr_description_label)
+        self.left_layout.addStretch()
+        self.right_layout.addStretch()
+        self.twelve_hour_check_box.stateChanged.connect(self.on_twelve_hour_check_box_changed)
+        self.thumbnails_check_box.stateChanged.connect(self.on_thumbnails_check_box_changed)
+        self.address_edit.textChanged.connect(self.set_urls)
+
+    def define_main_window_icon(self):
+        """
+        Define an icon on the main window to show the state of the server
+        :return:
+        """
+        self.remote_server_icon = QtWidgets.QLabel(self.main_window.status_bar)
+        size_policy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed)
+        size_policy.setHorizontalStretch(0)
+        size_policy.setVerticalStretch(0)
+        size_policy.setHeightForWidth(self.remote_server_icon.sizePolicy().hasHeightForWidth())
+        self.remote_server_icon.setSizePolicy(size_policy)
+        self.remote_server_icon.setFrameShadow(QtWidgets.QFrame.Plain)
+        self.remote_server_icon.setLineWidth(1)
+        self.remote_server_icon.setScaledContents(True)
+        self.remote_server_icon.setFixedSize(20, 20)
+        self.remote_server_icon.setObjectName('remote_server_icon')
+        self.main_window.status_bar.insertPermanentWidget(2, self.remote_server_icon)
+
+    def retranslateUi(self):
+        self.tab_title_visible = translate('RemotePlugin.RemoteTab', 'Remote Interface')
+        self.server_settings_group_box.setTitle(translate('RemotePlugin.RemoteTab', 'Server Settings'))
+        self.address_label.setText(translate('RemotePlugin.RemoteTab', 'Serve on IP address:'))
+        self.port_label.setText(translate('RemotePlugin.RemoteTab', 'Port number:'))
+        self.remote_url_label.setText(translate('RemotePlugin.RemoteTab', 'Remote URL:'))
+        self.stage_url_label.setText(translate('RemotePlugin.RemoteTab', 'Stage view URL:'))
+        self.live_url_label.setText(translate('RemotePlugin.RemoteTab', 'Live view URL:'))
+        self.chords_url_label.setText(translate('RemotePlugin.RemoteTab', 'Chords view URL:'))
+        self.twelve_hour_check_box.setText(translate('RemotePlugin.RemoteTab', 'Display stage time in 12h format'))
+        self.thumbnails_check_box.setText(translate('RemotePlugin.RemoteTab',
+                                                    'Show thumbnails of non-text slides in remote and stage view.'))
+        self.android_app_group_box.setTitle(translate('RemotePlugin.RemoteTab', 'Android App'))
+        self.android_qr_description_label.setText(
+            translate('RemotePlugin.RemoteTab',
+                      'Scan the QR code or click <a href="{qr}">download</a> to install the Android app from Google '
+                      'Play.').format(qr='https://play.google.com/store/apps/details?id=org.openlp.android2'))
+        self.ios_app_group_box.setTitle(translate('RemotePlugin.RemoteTab', 'iOS App'))
+        self.ios_qr_description_label.setText(
+            translate('RemotePlugin.RemoteTab',
+                      'Scan the QR code or click <a href="{qr}">download</a> to install the iOS app from the App '
+                      'Store.').format(qr='https://itunes.apple.com/app/id1096218725'))
+        self.user_login_group_box.setTitle(translate('RemotePlugin.RemoteTab', 'User Authentication'))
+        self.aa = UiStrings()
+        self.update_site_group_box.setTitle(UiStrings().WebDownloadText)
+        self.user_id_label.setText(translate('RemotePlugin.RemoteTab', 'User id:'))
+        self.password_label.setText(translate('RemotePlugin.RemoteTab', 'Password:'))
+        self.current_version_label.setText(translate('RemotePlugin.RemoteTab', 'Current Version number:'))
+        self.master_version_label.setText(translate('RemotePlugin.RemoteTab', 'Latest Version number:'))
+
+    def set_urls(self):
+        """
+        Update the display based on the data input on the screen
+        """
+        ip_address = self.get_ip_address(self.address_edit.text())
+        http_url = 'http://{url}:{text}/'.format(url=ip_address, text=self.port_spin_box.text())
+        self.remote_url.setText('<a href="{url}">{url}</a>'.format(url=http_url))
+        http_url_temp = http_url + 'stage'
+        self.stage_url.setText('<a href="{url}">{url}</a>'.format(url=http_url_temp))
+        http_url_temp = http_url + 'main'
+        self.live_url.setText('<a href="{url}">{url}</a>'.format(url=http_url_temp))
+
+    @staticmethod
+    def get_ip_address(ip_address):
+        """
+        returns the IP address in dependency of the passed address
+        ip_address == 0.0.0.0: return the IP address of the first valid interface
+        else: return ip_address
+        """
+        if ip_address == ZERO_URL:
+            interfaces = QtNetwork.QNetworkInterface.allInterfaces()
+            for interface in interfaces:
+                if not interface.isValid():
+                    continue
+                if not (interface.flags() & (QtNetwork.QNetworkInterface.IsUp | QtNetwork.QNetworkInterface.IsRunning)):
+                    continue
+                for address in interface.addressEntries():
+                    ip = address.ip()
+                    if ip.protocol() == QtNetwork.QAbstractSocket.IPv4Protocol and \
+                       ip != QtNetwork.QHostAddress.LocalHost:
+                        return ip.toString()
+        return ip_address
+
+    def load(self):
+        """
+        Load the configuration and update the server configuration if necessary
+        """
+        self.port_spin_box.setText(str(Settings().value(self.settings_section + '/port')))
+        self.address_edit.setText(Settings().value(self.settings_section + '/ip address'))
+        self.twelve_hour = Settings().value(self.settings_section + '/twelve hour')
+        self.twelve_hour_check_box.setChecked(self.twelve_hour)
+        self.thumbnails = Settings().value(self.settings_section + '/thumbnails')
+        self.thumbnails_check_box.setChecked(self.thumbnails)
+        self.user_login_group_box.setChecked(Settings().value(self.settings_section + '/authentication enabled'))
+        self.user_id.setText(Settings().value(self.settings_section + '/user id'))
+        self.password.setText(Settings().value(self.settings_section + '/password'))
+        self.current_version_value.setText(Settings().value('remotes/download version'))
+        self.master_version_value.setText(Registry().get_flag('website_version'))
+        if self.master_version_value.text() == self.current_version_value.text():
+            self.update_site_group_box.setEnabled(False)
+        self.set_urls()
+
+    def save(self):
+        """
+        Save the configuration and update the server configuration if necessary
+        """
+        if Settings().value(self.settings_section + '/ip address') != self.address_edit.text():
+            self.settings_form.register_post_process('remotes_config_updated')
+        Settings().setValue(self.settings_section + '/ip address', self.address_edit.text())
+        Settings().setValue(self.settings_section + '/twelve hour', self.twelve_hour)
+        Settings().setValue(self.settings_section + '/thumbnails', self.thumbnails)
+        Settings().setValue(self.settings_section + '/authentication enabled', self.user_login_group_box.isChecked())
+        Settings().setValue(self.settings_section + '/user id', self.user_id.text())
+        Settings().setValue(self.settings_section + '/password', self.password.text())
+        self.generate_icon()
+        if self.update_site_group_box.isChecked():
+            self.settings_form.register_post_process('download_website')
+
+    def on_twelve_hour_check_box_changed(self, check_state):
+        """
+        Toggle the 12 hour check box.
+        """
+        self.twelve_hour = False
+        # we have a set value convert to True/False
+        if check_state == QtCore.Qt.Checked:
+            self.twelve_hour = True
+
+    def on_thumbnails_check_box_changed(self, check_state):
+        """
+        Toggle the thumbnail check box.
+        """
+        self.thumbnails = False
+        # we have a set value convert to True/False
+        if check_state == QtCore.Qt.Checked:
+            self.thumbnails = True
+
+    def generate_icon(self):
+        """
+        Generate icon for main window
+        """
+        self.remote_server_icon.hide()
+        icon = QtGui.QImage(':/remote/network_server.png')
+        icon = icon.scaled(80, 80, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation)
+        if Settings().value(self.settings_section + '/authentication enabled'):
+            overlay = QtGui.QImage(':/remote/network_auth.png')
+            overlay = overlay.scaled(60, 60, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation)
+            painter = QtGui.QPainter(icon)
+            painter.drawImage(20, 0, overlay)
+            painter.end()
+        self.remote_server_icon.setPixmap(QtGui.QPixmap.fromImage(icon))
+        self.remote_server_icon.show()

=== added file 'openlp/core/api/websockets.py'
--- openlp/core/api/websockets.py	1970-01-01 00:00:00 +0000
+++ openlp/core/api/websockets.py	2017-08-13 07:11:15 +0000
@@ -0,0 +1,142 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2017 OpenLP Developers                                   #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+
+"""
+The :mod:`http` module contains the API web server. This is a lightweight web server used by remotes to interact
+with OpenLP. It uses JSON to communicate with the remotes.
+"""
+
+import asyncio
+import websockets
+import json
+import logging
+import time
+
+from PyQt5 import QtCore
+
+from openlp.core.common import Settings, RegistryProperties, OpenLPMixin, Registry
+
+log = logging.getLogger(__name__)
+
+
+class WebSocketWorker(QtCore.QObject):
+    """
+    A special Qt thread class to allow the WebSockets server to run at the same time as the UI.
+    """
+    def __init__(self, server):
+        """
+        Constructor for the thread class.
+
+        :param server: The http server class.
+        """
+        self.ws_server = server
+        super(WebSocketWorker, self).__init__()
+
+    def run(self):
+        """
+        Run the thread.
+        """
+        self.ws_server.start_server()
+
+    def stop(self):
+        self.ws_server.stop = True
+
+
+class WebSocketServer(RegistryProperties, OpenLPMixin):
+    """
+    Wrapper round a server instance
+    """
+    def __init__(self):
+        """
+        Initialise and start the WebSockets server
+        """
+        super(WebSocketServer, self).__init__()
+        self.settings_section = 'api'
+        self.worker = WebSocketWorker(self)
+        self.thread = QtCore.QThread()
+        self.worker.moveToThread(self.thread)
+        self.thread.started.connect(self.worker.run)
+        self.thread.start()
+
+    def start_server(self):
+        """
+        Start the correct server and save the handler
+        """
+        address = Settings().value(self.settings_section + '/ip address')
+        port = Settings().value(self.settings_section + '/websocket port')
+        self.start_websocket_instance(address, port)
+        # If web socket server start listening
+        if hasattr(self, 'ws_server') and self.ws_server:
+            event_loop = asyncio.new_event_loop()
+            asyncio.set_event_loop(event_loop)
+            event_loop.run_until_complete(self.ws_server)
+            event_loop.run_forever()
+        else:
+            log.debug('Failed to start ws server on port {port}'.format(port=port))
+
+    def start_websocket_instance(self, address, port):
+        """
+        Start the server
+
+        :param address: The server address
+        :param port: The run port
+        """
+        loop = 1
+        while loop < 4:
+            try:
+                self.ws_server = websockets.serve(self.handle_websocket, address, port)
+                log.debug("Web Socket Server started for class {address} {port}".format(address=address, port=port))
+                break
+            except Exception as e:
+                log.error('Failed to start ws server {why}'.format(why=e))
+                loop += 1
+                time.sleep(0.1)
+
+    @staticmethod
+    async def handle_websocket(request, path):
+        """
+        Handle web socket requests and return the poll information.
+        Check ever 0.2 seconds to get the latest position and send if changed.
+        Only gets triggered when 1st client attaches
+
+        :param request: request from client
+        :param path: determines the endpoints supported
+        :return:
+        """
+        log.debug("web socket handler registered with client")
+        previous_poll = None
+        previous_main_poll = None
+        poller = Registry().get('poller')
+        if path == '/state':
+            while True:
+                current_poll = poller.poll()
+                if current_poll != previous_poll:
+                    await request.send(json.dumps(current_poll).encode())
+                    previous_poll = current_poll
+                await asyncio.sleep(0.2)
+        elif path == '/live_changed':
+            while True:
+                main_poll = poller.main_poll()
+                if main_poll != previous_main_poll:
+                    await request.send(main_poll)
+                    previous_main_poll = main_poll
+                await asyncio.sleep(0.2)

=== modified file 'openlp/core/common/httputils.py'
--- openlp/core/common/httputils.py	2017-02-26 21:14:49 +0000
+++ openlp/core/common/httputils.py	2017-08-13 07:11:15 +0000
@@ -25,8 +25,10 @@
 import hashlib
 import logging
 import os
+import platform
 import socket
 import sys
+import subprocess
 import time
 import urllib.error
 import urllib.parse
@@ -215,6 +217,7 @@
     block_count = 0
     block_size = 4096
     retries = 0
+    log.debug("url_get_file: " + url)
     while True:
         try:
             filename = open(f_path, "wb")
@@ -253,4 +256,17 @@
     return True
 
 
+def ping(host):
+    """
+    Returns True if host responds to a ping request
+    """
+    # Ping parameters as function of OS
+    ping_str = "-n 1" if platform.system().lower() == "windows" else "-c 1"
+    args = "ping " + " " + ping_str + " " + host
+    need_sh = False if platform.system().lower() == "windows" else True
+
+    # Ping
+    return subprocess.call(args, shell=need_sh) == 0
+
+
 __all__ = ['get_web_page']

=== modified file 'openlp/core/common/settings.py'
--- openlp/core/common/settings.py	2017-06-05 06:05:54 +0000
+++ openlp/core/common/settings.py	2017-08-13 07:11:15 +0000
@@ -134,6 +134,14 @@
         'advanced/single click service preview': False,
         'advanced/x11 bypass wm': X11_BYPASS_DEFAULT,
         'advanced/search as type': True,
+        'api/twelve hour': True,
+        'api/port': 4316,
+        'api/websocket port': 4317,
+        'api/user id': 'openlp',
+        'api/password': 'password',
+        'api/authentication enabled': False,
+        'api/ip address': '0.0.0.0',
+        'api/thumbnails': True,
         'crashreport/last directory': '',
         'formattingTags/html_tags': '',
         'core/audio repeat list': False,
@@ -214,6 +222,17 @@
         ('media/players', 'media/players_temp', [(media_players_conv, None)]),  # Convert phonon to system
         ('media/players_temp', 'media/players', []),  # Move temp setting from above to correct setting
         ('advanced/default color', 'core/logo background color', []),  # Default image renamed + moved to general > 2.4.
+        ('advanced/default image', '/core/logo file', []),  # Default image renamed + moved to general after 2.4.
+        ('remotes/https enabled', '', []),
+        ('remotes/https port', '', []),
+        ('remotes/twelve hour', 'api/twelve hour', []),
+        ('remotes/port', 'api/port', []),
+        ('remotes/websocket port', 'api/websocket port', []),
+        ('remotes/user id', 'api/user id', []),
+        ('remotes/password', 'api/password', []),
+        ('remotes/authentication enabled', 'api/authentication enabled', []),
+        ('remotes/ip address', 'api/ip address', []),
+        ('remotes/thumbnails', 'api/thumbnails', []),
         ('advanced/default image', 'core/logo file', []),  # Default image renamed + moved to general after 2.4.
         ('shortcuts/escapeItem', 'shortcuts/desktopScreenEnable', []),  # Escape item was removed in 2.6.
         ('shortcuts/offlineHelpItem', 'shortcuts/userManualItem', []),  # Online and Offline help were combined in 2.6.

=== modified file 'openlp/core/common/uistrings.py'
--- openlp/core/common/uistrings.py	2017-07-04 22:30:41 +0000
+++ openlp/core/common/uistrings.py	2017-08-13 07:11:15 +0000
@@ -153,6 +153,7 @@
         self.Split = translate('OpenLP.Ui', 'Optional &Split')
         self.SplitToolTip = translate('OpenLP.Ui',
                                       'Split a slide into two only if it does not fit on the screen as one slide.')
+        self.StartingImport = translate('OpenLP.Ui', 'Starting import...')
         self.StopPlaySlidesInLoop = translate('OpenLP.Ui', 'Stop Play Slides in Loop')
         self.StopPlaySlidesToEnd = translate('OpenLP.Ui', 'Stop Play Slides to End')
         self.Theme = translate('OpenLP.Ui', 'Theme', 'Singular')
@@ -166,6 +167,7 @@
         self.View = translate('OpenLP.Ui', 'View')
         self.ViewMode = translate('OpenLP.Ui', 'View Mode')
         self.Video = translate('OpenLP.Ui', 'Video')
+        self.WebDownloadText = translate('OpenLP.Ui', 'Web Interface, Download and Install latest Version')
         book_chapter = translate('OpenLP.Ui', 'Book Chapter')
         chapter = translate('OpenLP.Ui', 'Chapter')
         verse = translate('OpenLP.Ui', 'Verse')

=== modified file 'openlp/core/common/versionchecker.py'
--- openlp/core/common/versionchecker.py	2017-08-01 20:59:41 +0000
+++ openlp/core/common/versionchecker.py	2017-08-13 07:11:15 +0000
@@ -1,3 +1,27 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2017 OpenLP Developers                                   #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+"""
+The :mod:`openlp.core.common` module downloads the version details for OpenLP.
+"""
 import logging
 import os
 import platform
@@ -12,7 +36,8 @@
 
 from PyQt5 import QtCore
 
-from openlp.core.common import AppLocation, Settings
+from openlp.core.common import AppLocation, Registry, Settings
+from openlp.core.common.httputils import ping
 
 log = logging.getLogger(__name__)
 
@@ -42,12 +67,18 @@
         """
         self.sleep(1)
         log.debug('Version thread - run')
-        app_version = get_application_version()
-        version = check_latest_version(app_version)
-        log.debug("Versions {version1} and {version2} ".format(version1=LooseVersion(str(version)),
-                                                               version2=LooseVersion(str(app_version['full']))))
-        if LooseVersion(str(version)) > LooseVersion(str(app_version['full'])):
-            self.main_window.openlp_version_check.emit('{version}'.format(version=version))
+        found = ping("openlp.io")
+        Registry().set_flag('internet_present', found)
+        update_check = Settings().value('core/update check')
+        if found:
+            Registry().execute('get_website_version')
+            if update_check:
+                app_version = get_application_version()
+                version = check_latest_version(app_version)
+                log.debug("Versions {version1} and {version2} ".format(version1=LooseVersion(str(version)),
+                                                                       version2=LooseVersion(str(app_version['full']))))
+                if LooseVersion(str(version)) > LooseVersion(str(app_version['full'])):
+                    self.main_window.openlp_version_check.emit('{version}'.format(version=version))
 
 
 def get_application_version():

=== modified file 'openlp/core/lib/imagemanager.py'
--- openlp/core/lib/imagemanager.py	2017-05-30 18:42:35 +0000
+++ openlp/core/lib/imagemanager.py	2017-08-13 07:11:15 +0000
@@ -56,7 +56,7 @@
         """
         Run the thread.
         """
-        self.image_manager._process()
+        self.image_manager.process()
 
 
 class Priority(object):
@@ -235,8 +235,15 @@
     def get_image(self, path, source, width=-1, height=-1):
         """
         Return the ``QImage`` from the cache. If not present wait for the background thread to process it.
+
+        :param: path: The image path
+        :param: source: The source of the image
+        :param: background: The image background colour
+        :param: width: The processed image width
+        :param: height: The processed image height
         """
-        log.debug('getImage {path}'.format(path=path))
+        log.debug('get_image {path} {source} {width} {height}'.format(path=path, source=source,
+                                                                      width=width, height=height))
         image = self._cache[(path, source, width, height)]
         if image.image is None:
             self._conversion_queue.modify_priority(image, Priority.High)
@@ -255,8 +262,15 @@
     def get_image_bytes(self, path, source, width=-1, height=-1):
         """
         Returns the byte string for an image. If not present wait for the background thread to process it.
+
+        :param: path: The image path
+        :param: source: The source of the image
+        :param: background: The image background colour
+        :param: width: The processed image width
+        :param: height: The processed image height
         """
-        log.debug('get_image_bytes {path}'.format(path=path))
+        log.debug('get_image_bytes {path} {source} {width} {height}'.format(path=path, source=source,
+                                                                            width=width, height=height))
         image = self._cache[(path, source, width, height)]
         if image.image_bytes is None:
             self._conversion_queue.modify_priority(image, Priority.Urgent)
@@ -270,9 +284,16 @@
     def add_image(self, path, source, background, width=-1, height=-1):
         """
         Add image to cache if it is not already there.
+
+        :param: path: The image path
+        :param: source: The source of the image
+        :param: background: The image background colour
+        :param: width: The processed image width
+        :param: height: The processed image height
         """
-        log.debug('add_image {path}'.format(path=path))
-        if (path, source, width, height) not in self._cache:
+        log.debug('add_image {path} {source} {width} {height}'.format(path=path, source=source,
+                                                                      width=width, height=height))
+        if not (path, source, width, height) in self._cache:
             image = Image(path, source, background, width, height)
             self._cache[(path, source, width, height)] = image
             self._conversion_queue.put((image.priority, image.secondary_priority, image))
@@ -286,11 +307,11 @@
         if not self.image_thread.isRunning():
             self.image_thread.start()
 
-    def _process(self):
+    def process(self):
         """
         Controls the processing called from a ``QtCore.QThread``.
         """
-        log.debug('_process - started')
+        log.debug('process - started')
         while not self._conversion_queue.empty() and not self.stop_manager:
             self._process_cache()
         log.debug('_process - ended')

=== modified file 'openlp/core/ui/firsttimeform.py'
--- openlp/core/ui/firsttimeform.py	2017-08-01 20:59:41 +0000
+++ openlp/core/ui/firsttimeform.py	2017-08-13 07:11:15 +0000
@@ -202,7 +202,7 @@
                 self.themes_url = self.web + self.config.get('themes', 'directory') + '/'
                 self.web_access = True
             except (NoSectionError, NoOptionError, MissingSectionHeaderError):
-                log.debug('A problem occured while parsing the downloaded config file')
+                log.debug('A problem occurred while parsing the downloaded config file')
                 trace_error_handler(log)
         self.update_screen_list_combo()
         self.application.process_events()
@@ -213,7 +213,6 @@
             self.presentation_check_box.setChecked(self.plugin_manager.get_plugin_by_name('presentations').is_active())
             self.image_check_box.setChecked(self.plugin_manager.get_plugin_by_name('images').is_active())
             self.media_check_box.setChecked(self.plugin_manager.get_plugin_by_name('media').is_active())
-            self.remote_check_box.setChecked(self.plugin_manager.get_plugin_by_name('remotes').is_active())
             self.custom_check_box.setChecked(self.plugin_manager.get_plugin_by_name('custom').is_active())
             self.song_usage_check_box.setChecked(self.plugin_manager.get_plugin_by_name('songusage').is_active())
             self.alert_check_box.setChecked(self.plugin_manager.get_plugin_by_name('alerts').is_active())
@@ -530,7 +529,6 @@
         self._set_plugin_status(self.presentation_check_box, 'presentations/status')
         self._set_plugin_status(self.image_check_box, 'images/status')
         self._set_plugin_status(self.media_check_box, 'media/status')
-        self._set_plugin_status(self.remote_check_box, 'remotes/status')
         self._set_plugin_status(self.custom_check_box, 'custom/status')
         self._set_plugin_status(self.song_usage_check_box, 'songusage/status')
         self._set_plugin_status(self.alert_check_box, 'alerts/status')

=== modified file 'openlp/core/ui/firsttimewizard.py'
--- openlp/core/ui/firsttimewizard.py	2016-12-31 11:01:36 +0000
+++ openlp/core/ui/firsttimewizard.py	2017-08-13 07:11:15 +0000
@@ -24,6 +24,7 @@
 """
 from PyQt5 import QtCore, QtGui, QtWidgets
 
+from openlp.core.common.uistrings import UiStrings
 from openlp.core.common import translate, is_macosx, clean_button_text, Settings
 from openlp.core.lib import build_icon
 from openlp.core.lib.ui import add_welcome_page
@@ -254,8 +255,7 @@
         self.presentation_check_box.setText(translate('OpenLP.FirstTimeWizard',
                                                       'Presentations – Show .ppt, .odp and .pdf files'))
         self.media_check_box.setText(translate('OpenLP.FirstTimeWizard', 'Media – Playback of Audio and Video files'))
-        self.remote_check_box.setText(translate('OpenLP.FirstTimeWizard', 'Remote – Control OpenLP via browser or smart'
-                                                                          'phone app'))
+        self.remote_check_box.setText(str(UiStrings().WebDownloadText))
         self.song_usage_check_box.setText(translate('OpenLP.FirstTimeWizard', 'Song Usage Monitor'))
         self.alert_check_box.setText(translate('OpenLP.FirstTimeWizard',
                                                'Alerts – Display informative messages while showing other slides'))

=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py	2017-08-03 04:21:19 +0000
+++ openlp/core/ui/mainwindow.py	2017-08-13 07:11:15 +0000
@@ -34,6 +34,8 @@
 
 from PyQt5 import QtCore, QtGui, QtWidgets
 
+from openlp.core.api import websockets
+from openlp.core.api.http import server
 from openlp.core.common import Registry, RegistryProperties, AppLocation, LanguageManager, Settings, UiStrings, \
     check_directory_exists, translate, is_win, is_macosx, add_actions
 from openlp.core.common.actions import ActionList, CategoryOrder
@@ -49,6 +51,7 @@
 from openlp.core.ui.lib.dockwidget import OpenLPDockWidget
 from openlp.core.ui.lib.mediadockmanager import MediaDockManager
 
+
 log = logging.getLogger(__name__)
 
 MEDIA_MANAGER_STYLE = """
@@ -513,6 +516,9 @@
         Settings().set_up_default_values()
         self.about_form = AboutForm(self)
         MediaController()
+        if Registry().get_flag('no_web_server'):
+            websockets.WebSocketServer()
+            server.HttpServer()
         SettingsForm(self)
         self.formatting_tag_form = FormattingTagForm(self)
         self.shortcut_form = ShortcutListForm(self)
@@ -540,7 +546,7 @@
         self.tools_first_time_wizard.triggered.connect(self.on_first_time_wizard_clicked)
         self.update_theme_images.triggered.connect(self.on_update_theme_images)
         self.formatting_tag_item.triggered.connect(self.on_formatting_tag_item_clicked)
-        self.settings_configure_item.triggered.connect(self.on_settings_configure_iem_clicked)
+        self.settings_configure_item.triggered.connect(self.on_settings_configure_item_clicked)
         self.settings_shortcuts_item.triggered.connect(self.on_settings_shortcuts_item_clicked)
         self.settings_import_item.triggered.connect(self.on_settings_import_item_clicked)
         self.settings_export_item.triggered.connect(self.on_settings_export_item_clicked)
@@ -803,7 +809,7 @@
         """
         self.formatting_tag_form.exec()
 
-    def on_settings_configure_iem_clicked(self):
+    def on_settings_configure_item_clicked(self):
         """
         Show the Settings dialog
         """

=== modified file 'openlp/core/ui/media/__init__.py'
--- openlp/core/ui/media/__init__.py	2017-01-25 21:17:27 +0000
+++ openlp/core/ui/media/__init__.py	2017-08-13 07:11:15 +0000
@@ -146,5 +146,6 @@
 
 from .mediacontroller import MediaController
 from .playertab import PlayerTab
+from .endpoint import media_endpoint
 
 __all__ = ['MediaController', 'PlayerTab']

=== added file 'openlp/core/ui/media/endpoint.py'
--- openlp/core/ui/media/endpoint.py	1970-01-01 00:00:00 +0000
+++ openlp/core/ui/media/endpoint.py	2017-08-13 07:11:15 +0000
@@ -0,0 +1,72 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2017 OpenLP Developers                                   #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+import logging
+
+from openlp.core.api.http.endpoint import Endpoint
+from openlp.core.api.http import requires_auth
+from openlp.core.common import Registry
+
+
+log = logging.getLogger(__name__)
+
+media_endpoint = Endpoint('media')
+
+
+@media_endpoint.route('play')
+@requires_auth
+def media_play(request):
+    """
+    Handles requests for playing media
+
+    :param request: The http request object.
+    """
+    media = Registry().get('media_controller')
+    live = Registry().get('live_controller')
+    status = media.media_play(live, False)
+    return {'results': {'success': status}}
+
+
+@media_endpoint.route('pause')
+@requires_auth
+def media_pause(request):
+    """
+    Handles requests for pausing media
+
+    :param request: The http request object.
+    """
+    media = Registry().get('media_controller')
+    live = Registry().get('live_controller')
+    status = media.media_pause(live)
+    return {'results': {'success': status}}
+
+
+@media_endpoint.route('stop')
+@requires_auth
+def media_stop(request):
+    """
+    Handles requests for stopping
+
+    :param request: The http request object.
+    """
+    event = getattr(Registry().get('live_controller'), 'mediacontroller_live_stop')
+    event.emit()
+    return {'results': {'success': True}}

=== modified file 'openlp/core/ui/media/mediacontroller.py'
--- openlp/core/ui/media/mediacontroller.py	2017-05-30 18:50:39 +0000
+++ openlp/core/ui/media/mediacontroller.py	2017-08-13 07:11:15 +0000
@@ -28,12 +28,13 @@
 import datetime
 from PyQt5 import QtCore, QtWidgets
 
+from openlp.core.api.http import register_endpoint
 from openlp.core.common import OpenLPMixin, Registry, RegistryMixin, RegistryProperties, Settings, UiStrings, \
     extension_loader, translate
 from openlp.core.lib import ItemCapabilities
 from openlp.core.lib.ui import critical_error_message_box
-from openlp.core.common import AppLocation
 from openlp.core.ui import DisplayControllerType
+from openlp.core.ui.media.endpoint import media_endpoint
 from openlp.core.ui.media.vendor.mediainfoWrapper import MediaInfoWrapper
 from openlp.core.ui.media.mediaplayer import MediaPlayer
 from openlp.core.ui.media import MediaState, MediaInfo, MediaType, get_media_players, set_media_players,\
@@ -127,9 +128,11 @@
         Registry().register_function('media_unblank', self.media_unblank)
         # Signals for background video
         Registry().register_function('songs_hide', self.media_hide)
+        Registry().register_function('songs_blank', self.media_blank)
         Registry().register_function('songs_unblank', self.media_unblank)
         Registry().register_function('mediaitem_media_rebuild', self._set_active_players)
         Registry().register_function('mediaitem_suffixes', self._generate_extensions_lists)
+        register_endpoint(media_endpoint)
 
     def _set_active_players(self):
         """
@@ -611,6 +614,14 @@
         """
         self.media_play(msg[0], status)
 
+    def on_media_play(self):
+        """
+        Responds to the request to play a loaded video from the web.
+
+        :param msg: First element is the controller which should be used
+        """
+        self.media_play(Registry().get('live_controller'), False)
+
     def media_play(self, controller, first_time=True):
         """
         Responds to the request to play a loaded video
@@ -685,6 +696,14 @@
         """
         self.media_pause(msg[0])
 
+    def on_media_pause(self):
+        """
+        Responds to the request to pause a loaded video from the web.
+
+        :param msg: First element is the controller which should be used
+        """
+        self.media_pause(Registry().get('live_controller'))
+
     def media_pause(self, controller):
         """
         Responds to the request to pause a loaded video
@@ -725,6 +744,14 @@
         """
         self.media_stop(msg[0])
 
+    def on_media_stop(self):
+        """
+        Responds to the request to stop a loaded video from the web.
+
+        :param msg: First element is the controller which should be used
+        """
+        self.media_stop(Registry().get('live_controller'))
+
     def media_stop(self, controller, looping_background=False):
         """
         Responds to the request to stop a loaded video

=== modified file 'openlp/core/ui/settingsform.py'
--- openlp/core/ui/settingsform.py	2017-06-04 12:14:23 +0000
+++ openlp/core/ui/settingsform.py	2017-08-13 07:11:15 +0000
@@ -26,6 +26,7 @@
 
 from PyQt5 import QtCore, QtWidgets
 
+from openlp.core.api import ApiTab
 from openlp.core.common import Registry, RegistryProperties
 from openlp.core.lib import build_icon
 from openlp.core.ui import AdvancedTab, GeneralTab, ThemesTab
@@ -56,12 +57,13 @@
         self.projector_tab = None
         self.advanced_tab = None
         self.player_tab = None
+        self.api_tab = None
 
     def exec(self):
         """
         Execute the form
         """
-        # load all the
+        # load all the widgets
         self.setting_list_widget.blockSignals(True)
         self.setting_list_widget.clear()
         while self.stacked_layout.count():
@@ -72,6 +74,7 @@
         self.insert_tab(self.advanced_tab)
         self.insert_tab(self.player_tab)
         self.insert_tab(self.projector_tab)
+        self.insert_tab(self.api_tab)
         for plugin in self.plugin_manager.plugins:
             if plugin.settings_tab:
                 self.insert_tab(plugin.settings_tab, plugin.is_active())
@@ -93,6 +96,7 @@
             list_item = QtWidgets.QListWidgetItem(build_icon(tab_widget.icon_path), tab_widget.tab_title_visible)
             list_item.setData(QtCore.Qt.UserRole, tab_widget.tab_title)
             self.setting_list_widget.addItem(list_item)
+            tab_widget.load()
 
     def accept(self):
         """
@@ -154,10 +158,13 @@
         self.advanced_tab = AdvancedTab(self)
         # Advanced tab
         self.player_tab = PlayerTab(self)
+        # Api tab
+        self.api_tab = ApiTab(self)
         self.general_tab.post_set_up()
         self.themes_tab.post_set_up()
         self.advanced_tab.post_set_up()
         self.player_tab.post_set_up()
+        self.api_tab.post_set_up()
         for plugin in self.plugin_manager.plugins:
             if plugin.settings_tab:
                 plugin.settings_tab.post_set_up()

=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py	2017-03-28 05:15:05 +0000
+++ openlp/core/ui/slidecontroller.py	2017-08-13 07:11:15 +0000
@@ -439,6 +439,10 @@
         # NOTE: {t} used to keep line length < maxline
         getattr(self,
                 'slidecontroller_{t}_previous'.format(t=self.type_prefix)).connect(self.on_slide_selected_previous)
+        if self.is_live:
+            getattr(self, 'mediacontroller_live_play').connect(self.media_controller.on_media_play)
+            getattr(self, 'mediacontroller_live_pause').connect(self.media_controller.on_media_pause)
+            getattr(self, 'mediacontroller_live_stop').connect(self.media_controller.on_media_stop)
 
     def _slide_shortcut_activated(self):
         """
@@ -1530,6 +1534,9 @@
     slidecontroller_live_next = QtCore.pyqtSignal()
     slidecontroller_live_previous = QtCore.pyqtSignal()
     slidecontroller_toggle_display = QtCore.pyqtSignal(str)
+    mediacontroller_live_play = QtCore.pyqtSignal()
+    mediacontroller_live_pause = QtCore.pyqtSignal()
+    mediacontroller_live_stop = QtCore.pyqtSignal()
 
     def __init__(self, parent):
         """

=== modified file 'openlp/plugins/alerts/alertsplugin.py'
--- openlp/plugins/alerts/alertsplugin.py	2017-07-04 23:13:51 +0000
+++ openlp/plugins/alerts/alertsplugin.py	2017-08-13 07:11:15 +0000
@@ -24,6 +24,7 @@
 
 from PyQt5 import QtGui
 
+from openlp.core.api.http import register_endpoint
 from openlp.core.common import Settings, UiStrings, translate
 from openlp.core.common.actions import ActionList
 from openlp.core.lib import Plugin, StringContent, build_icon
@@ -31,6 +32,7 @@
 from openlp.core.lib.theme import VerticalType
 from openlp.core.lib.ui import create_action
 from openlp.core.ui import AlertLocation
+from openlp.plugins.alerts.endpoint import api_alerts_endpoint, alerts_endpoint
 from openlp.plugins.alerts.forms import AlertForm
 from openlp.plugins.alerts.lib import AlertsManager, AlertsTab
 from openlp.plugins.alerts.lib.db import init_schema
@@ -140,6 +142,8 @@
         AlertsManager(self)
         self.manager = Manager('alerts', init_schema)
         self.alert_form = AlertForm(self)
+        register_endpoint(alerts_endpoint)
+        register_endpoint(api_alerts_endpoint)
 
     def add_tools_menu_item(self, tools_menu):
         """

=== added file 'openlp/plugins/alerts/endpoint.py'
--- openlp/plugins/alerts/endpoint.py	1970-01-01 00:00:00 +0000
+++ openlp/plugins/alerts/endpoint.py	2017-08-13 07:11:15 +0000
@@ -0,0 +1,60 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2017 OpenLP Developers                                   #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+import logging
+import json
+import urllib
+from urllib.parse import urlparse
+
+from openlp.core.api.http.endpoint import Endpoint
+from openlp.core.api.http import requires_auth
+from openlp.core.common import Registry
+from openlp.core.lib import PluginStatus
+
+
+log = logging.getLogger(__name__)
+
+alerts_endpoint = Endpoint('alert')
+api_alerts_endpoint = Endpoint('api')
+
+
+@alerts_endpoint.route('')
+@api_alerts_endpoint.route('alert')
+@requires_auth
+def alert(request):
+    """
+    Handles requests for setting service items in the service manager
+
+    :param request: The http request object.
+    """
+    plugin = Registry().get('plugin_manager').get_plugin_by_name("alerts")
+    if plugin.status == PluginStatus.Active:
+        try:
+            json_data = request.GET.get('data')
+            text = json.loads(json_data)['request']['text']
+        except KeyError:
+            log.error("Endpoint alerts request text not found")
+            text = urllib.parse.unquote(text)
+        Registry().get('alerts_manager').alerts_text.emit([text])
+        success = True
+    else:
+        success = False
+    return {'results': {'success': success}}

=== modified file 'openlp/plugins/bibles/bibleplugin.py'
--- openlp/plugins/bibles/bibleplugin.py	2017-07-04 23:13:51 +0000
+++ openlp/plugins/bibles/bibleplugin.py	2017-08-13 07:11:15 +0000
@@ -22,9 +22,11 @@
 
 import logging
 
+from openlp.core.api.http import register_endpoint
 from openlp.core.common import UiStrings
 from openlp.core.common.actions import ActionList
 from openlp.core.lib import Plugin, StringContent, build_icon, translate
+from openlp.plugins.bibles.endpoint import api_bibles_endpoint, bibles_endpoint
 from openlp.core.lib.ui import create_action
 from openlp.plugins.bibles.lib import BibleManager, BiblesTab, BibleMediaItem, LayoutStyle, DisplayStyle, \
     LanguageSelection
@@ -75,6 +77,8 @@
         self.icon_path = ':/plugins/plugin_bibles.png'
         self.icon = build_icon(self.icon_path)
         self.manager = BibleManager(self)
+        register_endpoint(bibles_endpoint)
+        register_endpoint(api_bibles_endpoint)
 
     def initialise(self):
         """

=== added file 'openlp/plugins/bibles/endpoint.py'
--- openlp/plugins/bibles/endpoint.py	1970-01-01 00:00:00 +0000
+++ openlp/plugins/bibles/endpoint.py	2017-08-13 07:11:15 +0000
@@ -0,0 +1,100 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2017 OpenLP Developers                                   #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+import logging
+
+from openlp.core.api.http.endpoint import Endpoint
+from openlp.core.api.http.errors import NotFound
+from openlp.core.api.endpoint.pluginhelpers import search, live, service
+from openlp.core.api.http import requires_auth
+
+
+log = logging.getLogger(__name__)
+
+bibles_endpoint = Endpoint('bibles')
+api_bibles_endpoint = Endpoint('api')
+
+
+@bibles_endpoint.route('search')
+def bibles_search(request):
+    """
+    Handles requests for searching the bibles plugin
+
+    :param request: The http request object.
+    """
+    return search(request, 'bibles', log)
+
+
+@bibles_endpoint.route('live')
+@requires_auth
+def bibles_live(request):
+    """
+    Handles requests for making a song live
+
+    :param request: The http request object.
+    """
+    return live(request, 'bibles', log)
+
+
+@bibles_endpoint.route('add')
+@requires_auth
+def bibles_service(request):
+    """
+    Handles requests for adding a song to the service
+
+    :param request: The http request object.
+    """
+    service(request, 'bibles', log)
+
+
+@api_bibles_endpoint.route('bibles/search')
+def bibles_search_api(request):
+    """
+    Handles requests for searching the bibles plugin
+
+    :param request: The http request object.
+    """
+    return search(request, 'bibles', log)
+
+
+@api_bibles_endpoint.route('bibles/live')
+@requires_auth
+def bibles_live_api(request):
+    """
+    Handles requests for making a song live
+
+    :param request: The http request object.
+    """
+    return live(request, 'bibles', log)
+
+
+@api_bibles_endpoint.route('bibles/add')
+@requires_auth
+def bibles_service_api(request):
+    """
+    Handles requests for adding a song to the service
+
+    :param request: The http request object.
+    """
+    try:
+        search(request, 'bibles', log)
+    except NotFound:
+        return {'results': {'items': []}}

=== modified file 'openlp/plugins/custom/customplugin.py'
--- openlp/plugins/custom/customplugin.py	2017-06-04 09:52:15 +0000
+++ openlp/plugins/custom/customplugin.py	2017-08-13 07:11:15 +0000
@@ -26,8 +26,10 @@
 
 import logging
 
+from openlp.core.api.http import register_endpoint
 from openlp.core.lib import Plugin, StringContent, build_icon, translate
 from openlp.core.lib.db import Manager
+from openlp.plugins.custom.endpoint import api_custom_endpoint, custom_endpoint
 from openlp.plugins.custom.lib import CustomMediaItem, CustomTab
 from openlp.plugins.custom.lib.db import CustomSlide, init_schema
 from openlp.plugins.custom.lib.mediaitem import CustomSearch
@@ -61,6 +63,8 @@
         self.db_manager = Manager('custom', init_schema)
         self.icon_path = ':/plugins/plugin_custom.png'
         self.icon = build_icon(self.icon_path)
+        register_endpoint(custom_endpoint)
+        register_endpoint(api_custom_endpoint)
 
     @staticmethod
     def about():

=== added file 'openlp/plugins/custom/endpoint.py'
--- openlp/plugins/custom/endpoint.py	1970-01-01 00:00:00 +0000
+++ openlp/plugins/custom/endpoint.py	2017-08-13 07:11:15 +0000
@@ -0,0 +1,100 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2017 OpenLP Developers                                   #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+import logging
+
+from openlp.core.api.http.endpoint import Endpoint
+from openlp.core.api.http.errors import NotFound
+from openlp.core.api.endpoint.pluginhelpers import search, live, service
+from openlp.core.api.http import requires_auth
+
+
+log = logging.getLogger(__name__)
+
+custom_endpoint = Endpoint('custom')
+api_custom_endpoint = Endpoint('api')
+
+
+@custom_endpoint.route('search')
+def custom_search(request):
+    """
+    Handles requests for searching the custom plugin
+
+    :param request: The http request object.
+    """
+    return search(request, 'custom', log)
+
+
+@custom_endpoint.route('live')
+@requires_auth
+def custom_live(request):
+    """
+    Handles requests for making a song live
+
+    :param request: The http request object.
+    """
+    return live(request, 'custom', log)
+
+
+@custom_endpoint.route('add')
+@requires_auth
+def custom_service(request):
+    """
+    Handles requests for adding a song to the service
+
+    :param request: The http request object.
+    """
+    service(request, 'custom', log)
+
+
+@api_custom_endpoint.route('custom/search')
+def custom_search_api(request):
+    """
+    Handles requests for searching the custom plugin
+
+    :param request: The http request object.
+    """
+    return search(request, 'custom', log)
+
+
+@api_custom_endpoint.route('custom/live')
+@requires_auth
+def custom_live_api(request):
+    """
+    Handles requests for making a song live
+
+    :param request: The http request object.
+    """
+    return live(request, 'custom', log)
+
+
+@api_custom_endpoint.route('custom/add')
+@requires_auth
+def custom_service_api(request):
+    """
+    Handles requests for adding a song to the service
+
+    :param request: The http request object.
+    """
+    try:
+        search(request, 'custom', log)
+    except NotFound:
+        return {'results': {'items': []}}

=== added file 'openlp/plugins/images/endpoint.py'
--- openlp/plugins/images/endpoint.py	1970-01-01 00:00:00 +0000
+++ openlp/plugins/images/endpoint.py	2017-08-13 07:11:15 +0000
@@ -0,0 +1,113 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2017 OpenLP Developers                                   #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+import logging
+
+from openlp.core.api.http.endpoint import Endpoint
+from openlp.core.api.http.errors import NotFound
+from openlp.core.api.endpoint.pluginhelpers import search, live, service, display_thumbnails
+from openlp.core.api.http import requires_auth
+
+
+log = logging.getLogger(__name__)
+
+images_endpoint = Endpoint('images')
+api_images_endpoint = Endpoint('api')
+
+
+# images/thumbnails/320x240/1.jpg
+@images_endpoint.route('thumbnails/{dimensions}/{file_name}')
+def images_thumbnails(request, dimensions, file_name):
+    """
+    Return an image to a web page based on a URL
+    :param request: Request object
+    :param dimensions: the image size eg 88x88
+    :param file_name: the individual image name
+    :return:
+    """
+    return display_thumbnails(request, 'images', log, dimensions, file_name)
+
+
+@images_endpoint.route('search')
+def images_search(request):
+    """
+    Handles requests for searching the images plugin
+
+    :param request: The http request object.
+    """
+    return search(request, 'images', log)
+
+
+@images_endpoint.route('live')
+@requires_auth
+def images_live(request):
+    """
+    Handles requests for making a song live
+
+    :param request: The http request object.
+    """
+    return live(request, 'images', log)
+
+
+@images_endpoint.route('add')
+@requires_auth
+def images_service(request):
+    """
+    Handles requests for adding a song to the service
+
+    :param request: The http request object.
+    """
+    service(request, 'images', log)
+
+
+@api_images_endpoint.route('images/search')
+def images_search_api(request):
+    """
+    Handles requests for searching the images plugin
+
+    :param request: The http request object.
+    """
+    return search(request, 'images', log)
+
+
+@api_images_endpoint.route('images/live')
+@requires_auth
+def images_live_api(request):
+    """
+    Handles requests for making a song live
+
+    :param request: The http request object.
+    """
+    return live(request, 'images', log)
+
+
+@api_images_endpoint.route('images/add')
+@requires_auth
+def images_service_api(request):
+    """
+    Handles requests for adding a song to the service
+
+    :param request: The http request object.
+    """
+    try:
+        search(request, 'images', log)
+    except NotFound:
+        return {'results': {'items': []}}

=== modified file 'openlp/plugins/images/imageplugin.py'
--- openlp/plugins/images/imageplugin.py	2016-12-31 11:01:36 +0000
+++ openlp/plugins/images/imageplugin.py	2017-08-13 07:11:15 +0000
@@ -24,9 +24,11 @@
 
 import logging
 
+from openlp.core.api.http import register_endpoint
 from openlp.core.common import Settings, translate
 from openlp.core.lib import Plugin, StringContent, ImageSource, build_icon
 from openlp.core.lib.db import Manager
+from openlp.plugins.images.endpoint import api_images_endpoint, images_endpoint
 from openlp.plugins.images.lib import ImageMediaItem, ImageTab
 from openlp.plugins.images.lib.db import init_schema
 
@@ -51,6 +53,8 @@
         self.weight = -7
         self.icon_path = ':/plugins/plugin_images.png'
         self.icon = build_icon(self.icon_path)
+        register_endpoint(images_endpoint)
+        register_endpoint(api_images_endpoint)
 
     @staticmethod
     def about():

=== added file 'openlp/plugins/media/endpoint.py'
--- openlp/plugins/media/endpoint.py	1970-01-01 00:00:00 +0000
+++ openlp/plugins/media/endpoint.py	2017-08-13 07:11:15 +0000
@@ -0,0 +1,100 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2017 OpenLP Developers                                   #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+import logging
+
+from openlp.core.api.http.endpoint import Endpoint
+from openlp.core.api.http.errors import NotFound
+from openlp.core.api.endpoint.pluginhelpers import search, live, service
+from openlp.core.api.http import requires_auth
+
+
+log = logging.getLogger(__name__)
+
+media_endpoint = Endpoint('media')
+api_media_endpoint = Endpoint('api')
+
+
+@media_endpoint.route('search')
+def media_search(request):
+    """
+    Handles requests for searching the media plugin
+
+    :param request: The http request object.
+    """
+    return search(request, 'media', log)
+
+
+@media_endpoint.route('live')
+@requires_auth
+def media_live(request):
+    """
+    Handles requests for making a song live
+
+    :param request: The http request object.
+    """
+    return live(request, 'media', log)
+
+
+@media_endpoint.route('add')
+@requires_auth
+def media_service(request):
+    """
+    Handles requests for adding a song to the service
+
+    :param request: The http request object.
+    """
+    service(request, 'media', log)
+
+
+@api_media_endpoint.route('media/search')
+def media_search_api(request):
+    """
+    Handles requests for searching the media plugin
+
+    :param request: The http request object.
+    """
+    return search(request, 'media', log)
+
+
+@api_media_endpoint.route('media/live')
+@requires_auth
+def media_live_api(request):
+    """
+    Handles requests for making a song live
+
+    :param request: The http request object.
+    """
+    return live(request, 'media', log)
+
+
+@api_media_endpoint.route('media/add')
+@requires_auth
+def media_service_api(request):
+    """
+    Handles requests for adding a song to the service
+
+    :param request: The http request object.
+    """
+    try:
+        search(request, 'media', log)
+    except NotFound:
+        return {'results': {'items': []}}

=== modified file 'openlp/plugins/media/mediaplugin.py'
--- openlp/plugins/media/mediaplugin.py	2017-08-01 20:59:41 +0000
+++ openlp/plugins/media/mediaplugin.py	2017-08-13 07:11:15 +0000
@@ -26,12 +26,13 @@
 import logging
 import os
 import re
-from shutil import which
 
 from PyQt5 import QtCore
 
-from openlp.core.common import AppLocation, Settings, translate, check_binary_exists, is_win
+from openlp.core.api.http import register_endpoint
+from openlp.core.common import AppLocation, translate, check_binary_exists
 from openlp.core.lib import Plugin, StringContent, build_icon
+from openlp.plugins.media.endpoint import api_media_endpoint, media_endpoint
 from openlp.plugins.media.lib import MediaMediaItem, MediaTab
 
 
@@ -58,6 +59,8 @@
         self.icon = build_icon(self.icon_path)
         # passed with drag and drop messages
         self.dnd_id = 'Media'
+        register_endpoint(media_endpoint)
+        register_endpoint(api_media_endpoint)
 
     def initialise(self):
         """

=== added file 'openlp/plugins/presentations/endpoint.py'
--- openlp/plugins/presentations/endpoint.py	1970-01-01 00:00:00 +0000
+++ openlp/plugins/presentations/endpoint.py	2017-08-13 07:11:15 +0000
@@ -0,0 +1,114 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2017 OpenLP Developers                                   #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+import logging
+
+from openlp.core.api.http.endpoint import Endpoint
+from openlp.core.api.http.errors import NotFound
+from openlp.core.api.endpoint.pluginhelpers import search, live, service, display_thumbnails
+from openlp.core.api.http import requires_auth
+
+
+log = logging.getLogger(__name__)
+
+presentations_endpoint = Endpoint('presentations')
+api_presentations_endpoint = Endpoint('api')
+
+
+# /presentations/thumbnails88x88/PA%20Rota.pdf/slide5.png
+@presentations_endpoint.route('thumbnails/{dimensions}/{file_name}/{slide}')
+def presentations_thumbnails(request, dimensions, file_name, slide):
+    """
+    Return a presentation to a web page based on a URL
+    :param request: Request object
+    :param dimensions: the image size eg 88x88
+    :param file_name: the file name of the image
+    :param slide: the individual image name
+    :return:
+    """
+    return display_thumbnails(request, 'presentations', log, dimensions, file_name, slide)
+
+
+@presentations_endpoint.route('search')
+def presentations_search(request):
+    """
+    Handles requests for searching the presentations plugin
+
+    :param request: The http request object.
+    """
+    return search(request, 'presentations', log)
+
+
+@presentations_endpoint.route('live')
+@requires_auth
+def presentations_live(request):
+    """
+    Handles requests for making a song live
+
+    :param request: The http request object.
+    """
+    return live(request, 'presentations', log)
+
+
+@presentations_endpoint.route('add')
+@requires_auth
+def presentations_service(request):
+    """
+    Handles requests for adding a song to the service
+
+    :param request: The http request object.
+    """
+    service(request, 'presentations', log)
+
+
+@api_presentations_endpoint.route('presentations/search')
+def presentations_search_api(request):
+    """
+    Handles requests for searching the presentations plugin
+
+    :param request: The http request object.
+    """
+    return search(request, 'presentations', log)
+
+
+@api_presentations_endpoint.route('presentations/live')
+@requires_auth
+def presentations_live_api(request):
+    """
+    Handles requests for making a song live
+
+    :param request: The http request object.
+    """
+    return live(request, 'presentations', log)
+
+
+@api_presentations_endpoint.route('presentations/add')
+@requires_auth
+def presentations_service_api(request):
+    """
+    Handles requests for adding a song to the service
+
+    :param request: The http request object.
+    """
+    try:
+        search(request, 'presentations', log)
+    except NotFound:
+        return {'results': {'items': []}}

=== modified file 'openlp/plugins/presentations/presentationplugin.py'
--- openlp/plugins/presentations/presentationplugin.py	2017-06-09 06:06:49 +0000
+++ openlp/plugins/presentations/presentationplugin.py	2017-08-13 07:11:15 +0000
@@ -28,8 +28,10 @@
 
 from PyQt5 import QtCore
 
-from openlp.core.common import AppLocation, extension_loader, translate
+from openlp.core.api.http import register_endpoint
+from openlp.core.common import extension_loader, translate
 from openlp.core.lib import Plugin, StringContent, build_icon
+from openlp.plugins.presentations.endpoint import api_presentations_endpoint, presentations_endpoint
 from openlp.plugins.presentations.lib import PresentationController, PresentationMediaItem, PresentationTab
 
 log = logging.getLogger(__name__)
@@ -66,6 +68,8 @@
         self.weight = -8
         self.icon_path = ':/plugins/plugin_presentations.png'
         self.icon = build_icon(self.icon_path)
+        register_endpoint(presentations_endpoint)
+        register_endpoint(api_presentations_endpoint)
 
     def create_settings_tab(self, parent):
         """

=== modified file 'openlp/plugins/remotes/__init__.py'
--- openlp/plugins/remotes/__init__.py	2016-12-31 11:01:36 +0000
+++ openlp/plugins/remotes/__init__.py	2017-08-13 07:11:15 +0000
@@ -19,71 +19,3 @@
 # with this program; if not, write to the Free Software Foundation, Inc., 59  #
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
-"""
-The :mod:`remotes` plugin allows OpenLP to be controlled from another machine
-over a network connection.
-
-Routes:
-
-``/``
-    Go to the web interface.
-
-``/files/{filename}``
-    Serve a static file.
-
-``/api/poll``
-    Poll to see if there are any changes. Returns a JSON-encoded dict of
-    any changes that occurred::
-
-        {"results": {"type": "controller"}}
-
-    Or, if there were no results, False::
-
-        {"results": False}
-
-``/api/controller/{live|preview}/{action}``
-    Perform ``{action}`` on the live or preview controller. Valid actions
-    are:
-
-    ``next``
-        Load the next slide.
-
-    ``previous``
-        Load the previous slide.
-
-    ``jump``
-        Jump to a specific slide. Requires an id return in a JSON-encoded
-        dict like so::
-
-            {"request": {"id": 1}}
-
-    ``first``
-        Load the first slide.
-
-    ``last``
-        Load the last slide.
-
-    ``text``
-        Request the text of the current slide.
-
-``/api/service/{action}``
-    Perform ``{action}`` on the service manager (e.g. go live). Data is
-    passed as a json-encoded ``data`` parameter. Valid actions are:
-
-    ``next``
-        Load the next item in the service.
-
-    ``previous``
-        Load the previews item in the service.
-
-    ``jump``
-        Jump to a specific item in the service. Requires an id returned in
-        a JSON-encoded dict like so::
-
-            {"request": {"id": 1}}
-
-    ``list``
-        Request a list of items in the service.
-
-
-"""

=== added file 'openlp/plugins/remotes/deploy.py'
--- openlp/plugins/remotes/deploy.py	1970-01-01 00:00:00 +0000
+++ openlp/plugins/remotes/deploy.py	2017-08-13 07:11:15 +0000
@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2017 OpenLP Developers                                   #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+
+import os
+import zipfile
+import urllib.error
+
+from openlp.core.common import AppLocation, Registry
+from openlp.core.common.httputils import url_get_file, get_web_page, get_url_file_size
+
+
+def deploy_zipfile(app_root, zip_name):
+    """
+    Process the downloaded zip file and add to the correct directory
+
+    :param zip_name: the zip file to be processed
+    :param app_root: the directory where the zip get expanded to
+
+    :return: None
+    """
+    zip_file = os.path.join(app_root, zip_name)
+    web_zip = zipfile.ZipFile(zip_file)
+    web_zip.extractall(app_root)
+
+
+def download_sha256():
+    """
+    Download the config file to extract the sha256 and version number
+    """
+    user_agent = 'OpenLP/' + Registry().get('application').applicationVersion()
+    try:
+        web_config = get_web_page('{host}{name}'.format(host='https://get.openlp.org/webclient/', name='download.cfg'),
+                                  header=('User-Agent', user_agent))
+    except (urllib.error.URLError, ConnectionError) as err:
+        return False
+    file_bits = web_config.read().decode('utf-8').split()
+    return file_bits[0], file_bits[2]
+
+
+def download_and_check(callback=None):
+    """
+    Download the web site and deploy it.
+    """
+    sha256, version = download_sha256()
+    file_size = get_url_file_size('https://get.openlp.org/webclient/site.zip')
+    callback.setRange(0, file_size)
+    if url_get_file(callback, '{host}{name}'.format(host='https://get.openlp.org/webclient/', name='site.zip'),
+                    os.path.join(str(AppLocation.get_section_data_path('remotes')), 'site.zip'),
+                    sha256=sha256):
+        deploy_zipfile(str(AppLocation.get_section_data_path('remotes')), 'site.zip')

=== added file 'openlp/plugins/remotes/endpoint.py'
--- openlp/plugins/remotes/endpoint.py	1970-01-01 00:00:00 +0000
+++ openlp/plugins/remotes/endpoint.py	2017-08-13 07:11:15 +0000
@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2017 OpenLP Developers                                   #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+import logging
+
+import os
+
+from openlp.core.api.http.endpoint import Endpoint
+from openlp.core.api.endpoint.core import TRANSLATED_STRINGS
+from openlp.core.common import AppLocation
+
+
+static_dir = os.path.join(str(AppLocation.get_section_data_path('remotes')))
+
+log = logging.getLogger(__name__)
+
+remote_endpoint = Endpoint('remote', template_dir=static_dir, static_dir=static_dir)
+
+
+@remote_endpoint.route('{view}')
+def index(request, view):
+    """
+    Handles requests for /remotes url
+
+    :param request: The http request object.
+    :param view: The view name to be servered.
+    """
+    return remote_endpoint.render_template('{view}.mako'.format(view=view), **TRANSLATED_STRINGS)

=== removed directory 'openlp/plugins/remotes/html'
=== removed directory 'openlp/plugins/remotes/html/assets'
=== removed file 'openlp/plugins/remotes/html/assets/jquery.js'
--- openlp/plugins/remotes/html/assets/jquery.js	2016-03-19 18:49:55 +0000
+++ openlp/plugins/remotes/html/assets/jquery.js	1970-01-01 00:00:00 +0000
@@ -1,9404 +0,0 @@
-/*!
- * jQuery JavaScript Library v1.7.2
- * http://jquery.com/
- *
- * Copyright 2011, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2011, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
- *
- * Date: Wed Mar 21 12:46:34 2012 -0700
- */
-(function( window, undefined ) {
-
-// Use the correct document accordingly with window argument (sandbox)
-var document = window.document,
-	navigator = window.navigator,
-	location = window.location;
-var jQuery = (function() {
-
-// Define a local copy of jQuery
-var jQuery = function( selector, context ) {
-		// The jQuery object is actually just the init constructor 'enhanced'
-		return new jQuery.fn.init( selector, context, rootjQuery );
-	},
-
-	// Map over jQuery in case of overwrite
-	_jQuery = window.jQuery,
-
-	// Map over the $ in case of overwrite
-	_$ = window.$,
-
-	// A central reference to the root jQuery(document)
-	rootjQuery,
-
-	// A simple way to check for HTML strings or ID strings
-	// Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
-	quickExpr = /^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,
-
-	// Check if a string has a non-whitespace character in it
-	rnotwhite = /\S/,
-
-	// Used for trimming whitespace
-	trimLeft = /^\s+/,
-	trimRight = /\s+$/,
-
-	// Match a standalone tag
-	rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/,
-
-	// JSON RegExp
-	rvalidchars = /^[\],:{}\s]*$/,
-	rvalidescape = /\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,
-	rvalidtokens = /"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,
-	rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
-
-	// Useragent RegExp
-	rwebkit = /(webkit)[ \/]([\w.]+)/,
-	ropera = /(opera)(?:.*version)?[ \/]([\w.]+)/,
-	rmsie = /(msie) ([\w.]+)/,
-	rmozilla = /(mozilla)(?:.*? rv:([\w.]+))?/,
-
-	// Matches dashed string for camelizing
-	rdashAlpha = /-([a-z]|[0-9])/ig,
-	rmsPrefix = /^-ms-/,
-
-	// Used by jQuery.camelCase as callback to replace()
-	fcamelCase = function( all, letter ) {
-		return ( letter + "" ).toUpperCase();
-	},
-
-	// Keep a UserAgent string for use with jQuery.browser
-	userAgent = navigator.userAgent,
-
-	// For matching the engine and version of the browser
-	browserMatch,
-
-	// The deferred used on DOM ready
-	readyList,
-
-	// The ready event handler
-	DOMContentLoaded,
-
-	// Save a reference to some core methods
-	toString = Object.prototype.toString,
-	hasOwn = Object.prototype.hasOwnProperty,
-	push = Array.prototype.push,
-	slice = Array.prototype.slice,
-	trim = String.prototype.trim,
-	indexOf = Array.prototype.indexOf,
-
-	// [[Class]] -> type pairs
-	class2type = {};
-
-jQuery.fn = jQuery.prototype = {
-	constructor: jQuery,
-	init: function( selector, context, rootjQuery ) {
-		var match, elem, ret, doc;
-
-		// Handle $(""), $(null), or $(undefined)
-		if ( !selector ) {
-			return this;
-		}
-
-		// Handle $(DOMElement)
-		if ( selector.nodeType ) {
-			this.context = this[0] = selector;
-			this.length = 1;
-			return this;
-		}
-
-		// The body element only exists once, optimize finding it
-		if ( selector === "body" && !context && document.body ) {
-			this.context = document;
-			this[0] = document.body;
-			this.selector = selector;
-			this.length = 1;
-			return this;
-		}
-
-		// Handle HTML strings
-		if ( typeof selector === "string" ) {
-			// Are we dealing with HTML string or an ID?
-			if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) {
-				// Assume that strings that start and end with <> are HTML and skip the regex check
-				match = [ null, selector, null ];
-
-			} else {
-				match = quickExpr.exec( selector );
-			}
-
-			// Verify a match, and that no context was specified for #id
-			if ( match && (match[1] || !context) ) {
-
-				// HANDLE: $(html) -> $(array)
-				if ( match[1] ) {
-					context = context instanceof jQuery ? context[0] : context;
-					doc = ( context ? context.ownerDocument || context : document );
-
-					// If a single string is passed in and it's a single tag
-					// just do a createElement and skip the rest
-					ret = rsingleTag.exec( selector );
-
-					if ( ret ) {
-						if ( jQuery.isPlainObject( context ) ) {
-							selector = [ document.createElement( ret[1] ) ];
-							jQuery.fn.attr.call( selector, context, true );
-
-						} else {
-							selector = [ doc.createElement( ret[1] ) ];
-						}
-
-					} else {
-						ret = jQuery.buildFragment( [ match[1] ], [ doc ] );
-						selector = ( ret.cacheable ? jQuery.clone(ret.fragment) : ret.fragment ).childNodes;
-					}
-
-					return jQuery.merge( this, selector );
-
-				// HANDLE: $("#id")
-				} else {
-					elem = document.getElementById( match[2] );
-
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document #6963
-					if ( elem && elem.parentNode ) {
-						// Handle the case where IE and Opera return items
-						// by name instead of ID
-						if ( elem.id !== match[2] ) {
-							return rootjQuery.find( selector );
-						}
-
-						// Otherwise, we inject the element directly into the jQuery object
-						this.length = 1;
-						this[0] = elem;
-					}
-
-					this.context = document;
-					this.selector = selector;
-					return this;
-				}
-
-			// HANDLE: $(expr, $(...))
-			} else if ( !context || context.jquery ) {
-				return ( context || rootjQuery ).find( selector );
-
-			// HANDLE: $(expr, context)
-			// (which is just equivalent to: $(context).find(expr)
-			} else {
-				return this.constructor( context ).find( selector );
-			}
-
-		// HANDLE: $(function)
-		// Shortcut for document ready
-		} else if ( jQuery.isFunction( selector ) ) {
-			return rootjQuery.ready( selector );
-		}
-
-		if ( selector.selector !== undefined ) {
-			this.selector = selector.selector;
-			this.context = selector.context;
-		}
-
-		return jQuery.makeArray( selector, this );
-	},
-
-	// Start with an empty selector
-	selector: "",
-
-	// The current version of jQuery being used
-	jquery: "1.7.2",
-
-	// The default length of a jQuery object is 0
-	length: 0,
-
-	// The number of elements contained in the matched element set
-	size: function() {
-		return this.length;
-	},
-
-	toArray: function() {
-		return slice.call( this, 0 );
-	},
-
-	// Get the Nth element in the matched element set OR
-	// Get the whole matched element set as a clean array
-	get: function( num ) {
-		return num == null ?
-
-			// Return a 'clean' array
-			this.toArray() :
-
-			// Return just the object
-			( num < 0 ? this[ this.length + num ] : this[ num ] );
-	},
-
-	// Take an array of elements and push it onto the stack
-	// (returning the new matched element set)
-	pushStack: function( elems, name, selector ) {
-		// Build a new jQuery matched element set
-		var ret = this.constructor();
-
-		if ( jQuery.isArray( elems ) ) {
-			push.apply( ret, elems );
-
-		} else {
-			jQuery.merge( ret, elems );
-		}
-
-		// Add the old object onto the stack (as a reference)
-		ret.prevObject = this;
-
-		ret.context = this.context;
-
-		if ( name === "find" ) {
-			ret.selector = this.selector + ( this.selector ? " " : "" ) + selector;
-		} else if ( name ) {
-			ret.selector = this.selector + "." + name + "(" + selector + ")";
-		}
-
-		// Return the newly-formed element set
-		return ret;
-	},
-
-	// Execute a callback for every element in the matched set.
-	// (You can seed the arguments with an array of args, but this is
-	// only used internally.)
-	each: function( callback, args ) {
-		return jQuery.each( this, callback, args );
-	},
-
-	ready: function( fn ) {
-		// Attach the listeners
-		jQuery.bindReady();
-
-		// Add the callback
-		readyList.add( fn );
-
-		return this;
-	},
-
-	eq: function( i ) {
-		i = +i;
-		return i === -1 ?
-			this.slice( i ) :
-			this.slice( i, i + 1 );
-	},
-
-	first: function() {
-		return this.eq( 0 );
-	},
-
-	last: function() {
-		return this.eq( -1 );
-	},
-
-	slice: function() {
-		return this.pushStack( slice.apply( this, arguments ),
-			"slice", slice.call(arguments).join(",") );
-	},
-
-	map: function( callback ) {
-		return this.pushStack( jQuery.map(this, function( elem, i ) {
-			return callback.call( elem, i, elem );
-		}));
-	},
-
-	end: function() {
-		return this.prevObject || this.constructor(null);
-	},
-
-	// For internal use only.
-	// Behaves like an Array's method, not like a jQuery method.
-	push: push,
-	sort: [].sort,
-	splice: [].splice
-};
-
-// Give the init function the jQuery prototype for later instantiation
-jQuery.fn.init.prototype = jQuery.fn;
-
-jQuery.extend = jQuery.fn.extend = function() {
-	var options, name, src, copy, copyIsArray, clone,
-		target = arguments[0] || {},
-		i = 1,
-		length = arguments.length,
-		deep = false;
-
-	// Handle a deep copy situation
-	if ( typeof target === "boolean" ) {
-		deep = target;
-		target = arguments[1] || {};
-		// skip the boolean and the target
-		i = 2;
-	}
-
-	// Handle case when target is a string or something (possible in deep copy)
-	if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
-		target = {};
-	}
-
-	// extend jQuery itself if only one argument is passed
-	if ( length === i ) {
-		target = this;
-		--i;
-	}
-
-	for ( ; i < length; i++ ) {
-		// Only deal with non-null/undefined values
-		if ( (options = arguments[ i ]) != null ) {
-			// Extend the base object
-			for ( name in options ) {
-				src = target[ name ];
-				copy = options[ name ];
-
-				// Prevent never-ending loop
-				if ( target === copy ) {
-					continue;
-				}
-
-				// Recurse if we're merging plain objects or arrays
-				if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
-					if ( copyIsArray ) {
-						copyIsArray = false;
-						clone = src && jQuery.isArray(src) ? src : [];
-
-					} else {
-						clone = src && jQuery.isPlainObject(src) ? src : {};
-					}
-
-					// Never move original objects, clone them
-					target[ name ] = jQuery.extend( deep, clone, copy );
-
-				// Don't bring in undefined values
-				} else if ( copy !== undefined ) {
-					target[ name ] = copy;
-				}
-			}
-		}
-	}
-
-	// Return the modified object
-	return target;
-};
-
-jQuery.extend({
-	noConflict: function( deep ) {
-		if ( window.$ === jQuery ) {
-			window.$ = _$;
-		}
-
-		if ( deep && window.jQuery === jQuery ) {
-			window.jQuery = _jQuery;
-		}
-
-		return jQuery;
-	},
-
-	// Is the DOM ready to be used? Set to true once it occurs.
-	isReady: false,
-
-	// A counter to track how many items to wait for before
-	// the ready event fires. See #6781
-	readyWait: 1,
-
-	// Hold (or release) the ready event
-	holdReady: function( hold ) {
-		if ( hold ) {
-			jQuery.readyWait++;
-		} else {
-			jQuery.ready( true );
-		}
-	},
-
-	// Handle when the DOM is ready
-	ready: function( wait ) {
-		// Either a released hold or an DOMready/load event and not yet ready
-		if ( (wait === true && !--jQuery.readyWait) || (wait !== true && !jQuery.isReady) ) {
-			// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
-			if ( !document.body ) {
-				return setTimeout( jQuery.ready, 1 );
-			}
-
-			// Remember that the DOM is ready
-			jQuery.isReady = true;
-
-			// If a normal DOM Ready event fired, decrement, and wait if need be
-			if ( wait !== true && --jQuery.readyWait > 0 ) {
-				return;
-			}
-
-			// If there are functions bound, to execute
-			readyList.fireWith( document, [ jQuery ] );
-
-			// Trigger any bound ready events
-			if ( jQuery.fn.trigger ) {
-				jQuery( document ).trigger( "ready" ).off( "ready" );
-			}
-		}
-	},
-
-	bindReady: function() {
-		if ( readyList ) {
-			return;
-		}
-
-		readyList = jQuery.Callbacks( "once memory" );
-
-		// Catch cases where $(document).ready() is called after the
-		// browser event has already occurred.
-		if ( document.readyState === "complete" ) {
-			// Handle it asynchronously to allow scripts the opportunity to delay ready
-			return setTimeout( jQuery.ready, 1 );
-		}
-
-		// Mozilla, Opera and webkit nightlies currently support this event
-		if ( document.addEventListener ) {
-			// Use the handy event callback
-			document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false );
-
-			// A fallback to window.onload, that will always work
-			window.addEventListener( "load", jQuery.ready, false );
-
-		// If IE event model is used
-		} else if ( document.attachEvent ) {
-			// ensure firing before onload,
-			// maybe late but safe also for iframes
-			document.attachEvent( "onreadystatechange", DOMContentLoaded );
-
-			// A fallback to window.onload, that will always work
-			window.attachEvent( "onload", jQuery.ready );
-
-			// If IE and not a frame
-			// continually check to see if the document is ready
-			var toplevel = false;
-
-			try {
-				toplevel = window.frameElement == null;
-			} catch(e) {}
-
-			if ( document.documentElement.doScroll && toplevel ) {
-				doScrollCheck();
-			}
-		}
-	},
-
-	// See test/unit/core.js for details concerning isFunction.
-	// Since version 1.3, DOM methods and functions like alert
-	// aren't supported. They return false on IE (#2968).
-	isFunction: function( obj ) {
-		return jQuery.type(obj) === "function";
-	},
-
-	isArray: Array.isArray || function( obj ) {
-		return jQuery.type(obj) === "array";
-	},
-
-	isWindow: function( obj ) {
-		return obj != null && obj == obj.window;
-	},
-
-	isNumeric: function( obj ) {
-		return !isNaN( parseFloat(obj) ) && isFinite( obj );
-	},
-
-	type: function( obj ) {
-		return obj == null ?
-			String( obj ) :
-			class2type[ toString.call(obj) ] || "object";
-	},
-
-	isPlainObject: function( obj ) {
-		// Must be an Object.
-		// Because of IE, we also have to check the presence of the constructor property.
-		// Make sure that DOM nodes and window objects don't pass through, as well
-		if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
-			return false;
-		}
-
-		try {
-			// Not own constructor property must be Object
-			if ( obj.constructor &&
-				!hasOwn.call(obj, "constructor") &&
-				!hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
-				return false;
-			}
-		} catch ( e ) {
-			// IE8,9 Will throw exceptions on certain host objects #9897
-			return false;
-		}
-
-		// Own properties are enumerated firstly, so to speed up,
-		// if last one is own, then all properties are own.
-
-		var key;
-		for ( key in obj ) {}
-
-		return key === undefined || hasOwn.call( obj, key );
-	},
-
-	isEmptyObject: function( obj ) {
-		for ( var name in obj ) {
-			return false;
-		}
-		return true;
-	},
-
-	error: function( msg ) {
-		throw new Error( msg );
-	},
-
-	parseJSON: function( data ) {
-		if ( typeof data !== "string" || !data ) {
-			return null;
-		}
-
-		// Make sure leading/trailing whitespace is removed (IE can't handle it)
-		data = jQuery.trim( data );
-
-		// Attempt to parse using the native JSON parser first
-		if ( window.JSON && window.JSON.parse ) {
-			return window.JSON.parse( data );
-		}
-
-		// Make sure the incoming data is actual JSON
-		// Logic borrowed from http://json.org/json2.js
-		if ( rvalidchars.test( data.replace( rvalidescape, "@" )
-			.replace( rvalidtokens, "]" )
-			.replace( rvalidbraces, "")) ) {
-
-			return ( new Function( "return " + data ) )();
-
-		}
-		jQuery.error( "Invalid JSON: " + data );
-	},
-
-	// Cross-browser xml parsing
-	parseXML: function( data ) {
-		if ( typeof data !== "string" || !data ) {
-			return null;
-		}
-		var xml, tmp;
-		try {
-			if ( window.DOMParser ) { // Standard
-				tmp = new DOMParser();
-				xml = tmp.parseFromString( data , "text/xml" );
-			} else { // IE
-				xml = new ActiveXObject( "Microsoft.XMLDOM" );
-				xml.async = "false";
-				xml.loadXML( data );
-			}
-		} catch( e ) {
-			xml = undefined;
-		}
-		if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) {
-			jQuery.error( "Invalid XML: " + data );
-		}
-		return xml;
-	},
-
-	noop: function() {},
-
-	// Evaluates a script in a global context
-	// Workarounds based on findings by Jim Driscoll
-	// http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
-	globalEval: function( data ) {
-		if ( data && rnotwhite.test( data ) ) {
-			// We use execScript on Internet Explorer
-			// We use an anonymous function so that context is window
-			// rather than jQuery in Firefox
-			( window.execScript || function( data ) {
-				window[ "eval" ].call( window, data );
-			} )( data );
-		}
-	},
-
-	// Convert dashed to camelCase; used by the css and data modules
-	// Microsoft forgot to hump their vendor prefix (#9572)
-	camelCase: function( string ) {
-		return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
-	},
-
-	nodeName: function( elem, name ) {
-		return elem.nodeName && elem.nodeName.toUpperCase() === name.toUpperCase();
-	},
-
-	// args is for internal usage only
-	each: function( object, callback, args ) {
-		var name, i = 0,
-			length = object.length,
-			isObj = length === undefined || jQuery.isFunction( object );
-
-		if ( args ) {
-			if ( isObj ) {
-				for ( name in object ) {
-					if ( callback.apply( object[ name ], args ) === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( ; i < length; ) {
-					if ( callback.apply( object[ i++ ], args ) === false ) {
-						break;
-					}
-				}
-			}
-
-		// A special, fast, case for the most common use of each
-		} else {
-			if ( isObj ) {
-				for ( name in object ) {
-					if ( callback.call( object[ name ], name, object[ name ] ) === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( ; i < length; ) {
-					if ( callback.call( object[ i ], i, object[ i++ ] ) === false ) {
-						break;
-					}
-				}
-			}
-		}
-
-		return object;
-	},
-
-	// Use native String.trim function wherever possible
-	trim: trim ?
-		function( text ) {
-			return text == null ?
-				"" :
-				trim.call( text );
-		} :
-
-		// Otherwise use our own trimming functionality
-		function( text ) {
-			return text == null ?
-				"" :
-				text.toString().replace( trimLeft, "" ).replace( trimRight, "" );
-		},
-
-	// results is for internal usage only
-	makeArray: function( array, results ) {
-		var ret = results || [];
-
-		if ( array != null ) {
-			// The window, strings (and functions) also have 'length'
-			// Tweaked logic slightly to handle Blackberry 4.7 RegExp issues #6930
-			var type = jQuery.type( array );
-
-			if ( array.length == null || type === "string" || type === "function" || type === "regexp" || jQuery.isWindow( array ) ) {
-				push.call( ret, array );
-			} else {
-				jQuery.merge( ret, array );
-			}
-		}
-
-		return ret;
-	},
-
-	inArray: function( elem, array, i ) {
-		var len;
-
-		if ( array ) {
-			if ( indexOf ) {
-				return indexOf.call( array, elem, i );
-			}
-
-			len = array.length;
-			i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0;
-
-			for ( ; i < len; i++ ) {
-				// Skip accessing in sparse arrays
-				if ( i in array && array[ i ] === elem ) {
-					return i;
-				}
-			}
-		}
-
-		return -1;
-	},
-
-	merge: function( first, second ) {
-		var i = first.length,
-			j = 0;
-
-		if ( typeof second.length === "number" ) {
-			for ( var l = second.length; j < l; j++ ) {
-				first[ i++ ] = second[ j ];
-			}
-
-		} else {
-			while ( second[j] !== undefined ) {
-				first[ i++ ] = second[ j++ ];
-			}
-		}
-
-		first.length = i;
-
-		return first;
-	},
-
-	grep: function( elems, callback, inv ) {
-		var ret = [], retVal;
-		inv = !!inv;
-
-		// Go through the array, only saving the items
-		// that pass the validator function
-		for ( var i = 0, length = elems.length; i < length; i++ ) {
-			retVal = !!callback( elems[ i ], i );
-			if ( inv !== retVal ) {
-				ret.push( elems[ i ] );
-			}
-		}
-
-		return ret;
-	},
-
-	// arg is for internal usage only
-	map: function( elems, callback, arg ) {
-		var value, key, ret = [],
-			i = 0,
-			length = elems.length,
-			// jquery objects are treated as arrays
-			isArray = elems instanceof jQuery || length !== undefined && typeof length === "number" && ( ( length > 0 && elems[ 0 ] && elems[ length -1 ] ) || length === 0 || jQuery.isArray( elems ) ) ;
-
-		// Go through the array, translating each of the items to their
-		if ( isArray ) {
-			for ( ; i < length; i++ ) {
-				value = callback( elems[ i ], i, arg );
-
-				if ( value != null ) {
-					ret[ ret.length ] = value;
-				}
-			}
-
-		// Go through every key on the object,
-		} else {
-			for ( key in elems ) {
-				value = callback( elems[ key ], key, arg );
-
-				if ( value != null ) {
-					ret[ ret.length ] = value;
-				}
-			}
-		}
-
-		// Flatten any nested arrays
-		return ret.concat.apply( [], ret );
-	},
-
-	// A global GUID counter for objects
-	guid: 1,
-
-	// Bind a function to a context, optionally partially applying any
-	// arguments.
-	proxy: function( fn, context ) {
-		if ( typeof context === "string" ) {
-			var tmp = fn[ context ];
-			context = fn;
-			fn = tmp;
-		}
-
-		// Quick check to determine if target is callable, in the spec
-		// this throws a TypeError, but we will just return undefined.
-		if ( !jQuery.isFunction( fn ) ) {
-			return undefined;
-		}
-
-		// Simulated bind
-		var args = slice.call( arguments, 2 ),
-			proxy = function() {
-				return fn.apply( context, args.concat( slice.call( arguments ) ) );
-			};
-
-		// Set the guid of unique handler to the same of original handler, so it can be removed
-		proxy.guid = fn.guid = fn.guid || proxy.guid || jQuery.guid++;
-
-		return proxy;
-	},
-
-	// Mutifunctional method to get and set values to a collection
-	// The value/s can optionally be executed if it's a function
-	access: function( elems, fn, key, value, chainable, emptyGet, pass ) {
-		var exec,
-			bulk = key == null,
-			i = 0,
-			length = elems.length;
-
-		// Sets many values
-		if ( key && typeof key === "object" ) {
-			for ( i in key ) {
-				jQuery.access( elems, fn, i, key[i], 1, emptyGet, value );
-			}
-			chainable = 1;
-
-		// Sets one value
-		} else if ( value !== undefined ) {
-			// Optionally, function values get executed if exec is true
-			exec = pass === undefined && jQuery.isFunction( value );
-
-			if ( bulk ) {
-				// Bulk operations only iterate when executing function values
-				if ( exec ) {
-					exec = fn;
-					fn = function( elem, key, value ) {
-						return exec.call( jQuery( elem ), value );
-					};
-
-				// Otherwise they run against the entire set
-				} else {
-					fn.call( elems, value );
-					fn = null;
-				}
-			}
-
-			if ( fn ) {
-				for (; i < length; i++ ) {
-					fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass );
-				}
-			}
-
-			chainable = 1;
-		}
-
-		return chainable ?
-			elems :
-
-			// Gets
-			bulk ?
-				fn.call( elems ) :
-				length ? fn( elems[0], key ) : emptyGet;
-	},
-
-	now: function() {
-		return ( new Date() ).getTime();
-	},
-
-	// Use of jQuery.browser is frowned upon.
-	// More details: http://docs.jquery.com/Utilities/jQuery.browser
-	uaMatch: function( ua ) {
-		ua = ua.toLowerCase();
-
-		var match = rwebkit.exec( ua ) ||
-			ropera.exec( ua ) ||
-			rmsie.exec( ua ) ||
-			ua.indexOf("compatible") < 0 && rmozilla.exec( ua ) ||
-			[];
-
-		return { browser: match[1] || "", version: match[2] || "0" };
-	},
-
-	sub: function() {
-		function jQuerySub( selector, context ) {
-			return new jQuerySub.fn.init( selector, context );
-		}
-		jQuery.extend( true, jQuerySub, this );
-		jQuerySub.superclass = this;
-		jQuerySub.fn = jQuerySub.prototype = this();
-		jQuerySub.fn.constructor = jQuerySub;
-		jQuerySub.sub = this.sub;
-		jQuerySub.fn.init = function init( selector, context ) {
-			if ( context && context instanceof jQuery && !(context instanceof jQuerySub) ) {
-				context = jQuerySub( context );
-			}
-
-			return jQuery.fn.init.call( this, selector, context, rootjQuerySub );
-		};
-		jQuerySub.fn.init.prototype = jQuerySub.fn;
-		var rootjQuerySub = jQuerySub(document);
-		return jQuerySub;
-	},
-
-	browser: {}
-});
-
-// Populate the class2type map
-jQuery.each("Boolean Number String Function Array Date RegExp Object".split(" "), function(i, name) {
-	class2type[ "[object " + name + "]" ] = name.toLowerCase();
-});
-
-browserMatch = jQuery.uaMatch( userAgent );
-if ( browserMatch.browser ) {
-	jQuery.browser[ browserMatch.browser ] = true;
-	jQuery.browser.version = browserMatch.version;
-}
-
-// Deprecated, use jQuery.browser.webkit instead
-if ( jQuery.browser.webkit ) {
-	jQuery.browser.safari = true;
-}
-
-// IE doesn't match non-breaking spaces with \s
-if ( rnotwhite.test( "\xA0" ) ) {
-	trimLeft = /^[\s\xA0]+/;
-	trimRight = /[\s\xA0]+$/;
-}
-
-// All jQuery objects should point back to these
-rootjQuery = jQuery(document);
-
-// Cleanup functions for the document ready method
-if ( document.addEventListener ) {
-	DOMContentLoaded = function() {
-		document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false );
-		jQuery.ready();
-	};
-
-} else if ( document.attachEvent ) {
-	DOMContentLoaded = function() {
-		// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
-		if ( document.readyState === "complete" ) {
-			document.detachEvent( "onreadystatechange", DOMContentLoaded );
-			jQuery.ready();
-		}
-	};
-}
-
-// The DOM ready check for Internet Explorer
-function doScrollCheck() {
-	if ( jQuery.isReady ) {
-		return;
-	}
-
-	try {
-		// If IE is used, use the trick by Diego Perini
-		// http://javascript.nwbox.com/IEContentLoaded/
-		document.documentElement.doScroll("left");
-	} catch(e) {
-		setTimeout( doScrollCheck, 1 );
-		return;
-	}
-
-	// and execute any waiting functions
-	jQuery.ready();
-}
-
-return jQuery;
-
-})();
-
-
-// String to Object flags format cache
-var flagsCache = {};
-
-// Convert String-formatted flags into Object-formatted ones and store in cache
-function createFlags( flags ) {
-	var object = flagsCache[ flags ] = {},
-		i, length;
-	flags = flags.split( /\s+/ );
-	for ( i = 0, length = flags.length; i < length; i++ ) {
-		object[ flags[i] ] = true;
-	}
-	return object;
-}
-
-/*
- * Create a callback list using the following parameters:
- *
- *	flags:	an optional list of space-separated flags that will change how
- *			the callback list behaves
- *
- * By default a callback list will act like an event callback list and can be
- * "fired" multiple times.
- *
- * Possible flags:
- *
- *	once:			will ensure the callback list can only be fired once (like a Deferred)
- *
- *	memory:			will keep track of previous values and will call any callback added
- *					after the list has been fired right away with the latest "memorized"
- *					values (like a Deferred)
- *
- *	unique:			will ensure a callback can only be added once (no duplicate in the list)
- *
- *	stopOnFalse:	interrupt callings when a callback returns false
- *
- */
-jQuery.Callbacks = function( flags ) {
-
-	// Convert flags from String-formatted to Object-formatted
-	// (we check in cache first)
-	flags = flags ? ( flagsCache[ flags ] || createFlags( flags ) ) : {};
-
-	var // Actual callback list
-		list = [],
-		// Stack of fire calls for repeatable lists
-		stack = [],
-		// Last fire value (for non-forgettable lists)
-		memory,
-		// Flag to know if list was already fired
-		fired,
-		// Flag to know if list is currently firing
-		firing,
-		// First callback to fire (used internally by add and fireWith)
-		firingStart,
-		// End of the loop when firing
-		firingLength,
-		// Index of currently firing callback (modified by remove if needed)
-		firingIndex,
-		// Add one or several callbacks to the list
-		add = function( args ) {
-			var i,
-				length,
-				elem,
-				type,
-				actual;
-			for ( i = 0, length = args.length; i < length; i++ ) {
-				elem = args[ i ];
-				type = jQuery.type( elem );
-				if ( type === "array" ) {
-					// Inspect recursively
-					add( elem );
-				} else if ( type === "function" ) {
-					// Add if not in unique mode and callback is not in
-					if ( !flags.unique || !self.has( elem ) ) {
-						list.push( elem );
-					}
-				}
-			}
-		},
-		// Fire callbacks
-		fire = function( context, args ) {
-			args = args || [];
-			memory = !flags.memory || [ context, args ];
-			fired = true;
-			firing = true;
-			firingIndex = firingStart || 0;
-			firingStart = 0;
-			firingLength = list.length;
-			for ( ; list && firingIndex < firingLength; firingIndex++ ) {
-				if ( list[ firingIndex ].apply( context, args ) === false && flags.stopOnFalse ) {
-					memory = true; // Mark as halted
-					break;
-				}
-			}
-			firing = false;
-			if ( list ) {
-				if ( !flags.once ) {
-					if ( stack && stack.length ) {
-						memory = stack.shift();
-						self.fireWith( memory[ 0 ], memory[ 1 ] );
-					}
-				} else if ( memory === true ) {
-					self.disable();
-				} else {
-					list = [];
-				}
-			}
-		},
-		// Actual Callbacks object
-		self = {
-			// Add a callback or a collection of callbacks to the list
-			add: function() {
-				if ( list ) {
-					var length = list.length;
-					add( arguments );
-					// Do we need to add the callbacks to the
-					// current firing batch?
-					if ( firing ) {
-						firingLength = list.length;
-					// With memory, if we're not firing then
-					// we should call right away, unless previous
-					// firing was halted (stopOnFalse)
-					} else if ( memory && memory !== true ) {
-						firingStart = length;
-						fire( memory[ 0 ], memory[ 1 ] );
-					}
-				}
-				return this;
-			},
-			// Remove a callback from the list
-			remove: function() {
-				if ( list ) {
-					var args = arguments,
-						argIndex = 0,
-						argLength = args.length;
-					for ( ; argIndex < argLength ; argIndex++ ) {
-						for ( var i = 0; i < list.length; i++ ) {
-							if ( args[ argIndex ] === list[ i ] ) {
-								// Handle firingIndex and firingLength
-								if ( firing ) {
-									if ( i <= firingLength ) {
-										firingLength--;
-										if ( i <= firingIndex ) {
-											firingIndex--;
-										}
-									}
-								}
-								// Remove the element
-								list.splice( i--, 1 );
-								// If we have some unicity property then
-								// we only need to do this once
-								if ( flags.unique ) {
-									break;
-								}
-							}
-						}
-					}
-				}
-				return this;
-			},
-			// Control if a given callback is in the list
-			has: function( fn ) {
-				if ( list ) {
-					var i = 0,
-						length = list.length;
-					for ( ; i < length; i++ ) {
-						if ( fn === list[ i ] ) {
-							return true;
-						}
-					}
-				}
-				return false;
-			},
-			// Remove all callbacks from the list
-			empty: function() {
-				list = [];
-				return this;
-			},
-			// Have the list do nothing anymore
-			disable: function() {
-				list = stack = memory = undefined;
-				return this;
-			},
-			// Is it disabled?
-			disabled: function() {
-				return !list;
-			},
-			// Lock the list in its current state
-			lock: function() {
-				stack = undefined;
-				if ( !memory || memory === true ) {
-					self.disable();
-				}
-				return this;
-			},
-			// Is it locked?
-			locked: function() {
-				return !stack;
-			},
-			// Call all callbacks with the given context and arguments
-			fireWith: function( context, args ) {
-				if ( stack ) {
-					if ( firing ) {
-						if ( !flags.once ) {
-							stack.push( [ context, args ] );
-						}
-					} else if ( !( flags.once && memory ) ) {
-						fire( context, args );
-					}
-				}
-				return this;
-			},
-			// Call all the callbacks with the given arguments
-			fire: function() {
-				self.fireWith( this, arguments );
-				return this;
-			},
-			// To know if the callbacks have already been called at least once
-			fired: function() {
-				return !!fired;
-			}
-		};
-
-	return self;
-};
-
-
-
-
-var // Static reference to slice
-	sliceDeferred = [].slice;
-
-jQuery.extend({
-
-	Deferred: function( func ) {
-		var doneList = jQuery.Callbacks( "once memory" ),
-			failList = jQuery.Callbacks( "once memory" ),
-			progressList = jQuery.Callbacks( "memory" ),
-			state = "pending",
-			lists = {
-				resolve: doneList,
-				reject: failList,
-				notify: progressList
-			},
-			promise = {
-				done: doneList.add,
-				fail: failList.add,
-				progress: progressList.add,
-
-				state: function() {
-					return state;
-				},
-
-				// Deprecated
-				isResolved: doneList.fired,
-				isRejected: failList.fired,
-
-				then: function( doneCallbacks, failCallbacks, progressCallbacks ) {
-					deferred.done( doneCallbacks ).fail( failCallbacks ).progress( progressCallbacks );
-					return this;
-				},
-				always: function() {
-					deferred.done.apply( deferred, arguments ).fail.apply( deferred, arguments );
-					return this;
-				},
-				pipe: function( fnDone, fnFail, fnProgress ) {
-					return jQuery.Deferred(function( newDefer ) {
-						jQuery.each( {
-							done: [ fnDone, "resolve" ],
-							fail: [ fnFail, "reject" ],
-							progress: [ fnProgress, "notify" ]
-						}, function( handler, data ) {
-							var fn = data[ 0 ],
-								action = data[ 1 ],
-								returned;
-							if ( jQuery.isFunction( fn ) ) {
-								deferred[ handler ](function() {
-									returned = fn.apply( this, arguments );
-									if ( returned && jQuery.isFunction( returned.promise ) ) {
-										returned.promise().then( newDefer.resolve, newDefer.reject, newDefer.notify );
-									} else {
-										newDefer[ action + "With" ]( this === deferred ? newDefer : this, [ returned ] );
-									}
-								});
-							} else {
-								deferred[ handler ]( newDefer[ action ] );
-							}
-						});
-					}).promise();
-				},
-				// Get a promise for this deferred
-				// If obj is provided, the promise aspect is added to the object
-				promise: function( obj ) {
-					if ( obj == null ) {
-						obj = promise;
-					} else {
-						for ( var key in promise ) {
-							obj[ key ] = promise[ key ];
-						}
-					}
-					return obj;
-				}
-			},
-			deferred = promise.promise({}),
-			key;
-
-		for ( key in lists ) {
-			deferred[ key ] = lists[ key ].fire;
-			deferred[ key + "With" ] = lists[ key ].fireWith;
-		}
-
-		// Handle state
-		deferred.done( function() {
-			state = "resolved";
-		}, failList.disable, progressList.lock ).fail( function() {
-			state = "rejected";
-		}, doneList.disable, progressList.lock );
-
-		// Call given func if any
-		if ( func ) {
-			func.call( deferred, deferred );
-		}
-
-		// All done!
-		return deferred;
-	},
-
-	// Deferred helper
-	when: function( firstParam ) {
-		var args = sliceDeferred.call( arguments, 0 ),
-			i = 0,
-			length = args.length,
-			pValues = new Array( length ),
-			count = length,
-			pCount = length,
-			deferred = length <= 1 && firstParam && jQuery.isFunction( firstParam.promise ) ?
-				firstParam :
-				jQuery.Deferred(),
-			promise = deferred.promise();
-		function resolveFunc( i ) {
-			return function( value ) {
-				args[ i ] = arguments.length > 1 ? sliceDeferred.call( arguments, 0 ) : value;
-				if ( !( --count ) ) {
-					deferred.resolveWith( deferred, args );
-				}
-			};
-		}
-		function progressFunc( i ) {
-			return function( value ) {
-				pValues[ i ] = arguments.length > 1 ? sliceDeferred.call( arguments, 0 ) : value;
-				deferred.notifyWith( promise, pValues );
-			};
-		}
-		if ( length > 1 ) {
-			for ( ; i < length; i++ ) {
-				if ( args[ i ] && args[ i ].promise && jQuery.isFunction( args[ i ].promise ) ) {
-					args[ i ].promise().then( resolveFunc(i), deferred.reject, progressFunc(i) );
-				} else {
-					--count;
-				}
-			}
-			if ( !count ) {
-				deferred.resolveWith( deferred, args );
-			}
-		} else if ( deferred !== firstParam ) {
-			deferred.resolveWith( deferred, length ? [ firstParam ] : [] );
-		}
-		return promise;
-	}
-});
-
-
-
-
-jQuery.support = (function() {
-
-	var support,
-		all,
-		a,
-		select,
-		opt,
-		input,
-		fragment,
-		tds,
-		events,
-		eventName,
-		i,
-		isSupported,
-		div = document.createElement( "div" ),
-		documentElement = document.documentElement;
-
-	// Preliminary tests
-	div.setAttribute("className", "t");
-	div.innerHTML = "   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
-
-	all = div.getElementsByTagName( "*" );
-	a = div.getElementsByTagName( "a" )[ 0 ];
-
-	// Can't get basic test support
-	if ( !all || !all.length || !a ) {
-		return {};
-	}
-
-	// First batch of supports tests
-	select = document.createElement( "select" );
-	opt = select.appendChild( document.createElement("option") );
-	input = div.getElementsByTagName( "input" )[ 0 ];
-
-	support = {
-		// IE strips leading whitespace when .innerHTML is used
-		leadingWhitespace: ( div.firstChild.nodeType === 3 ),
-
-		// Make sure that tbody elements aren't automatically inserted
-		// IE will insert them into empty tables
-		tbody: !div.getElementsByTagName("tbody").length,
-
-		// Make sure that link elements get serialized correctly by innerHTML
-		// This requires a wrapper element in IE
-		htmlSerialize: !!div.getElementsByTagName("link").length,
-
-		// Get the style information from getAttribute
-		// (IE uses .cssText instead)
-		style: /top/.test( a.getAttribute("style") ),
-
-		// Make sure that URLs aren't manipulated
-		// (IE normalizes it by default)
-		hrefNormalized: ( a.getAttribute("href") === "/a" ),
-
-		// Make sure that element opacity exists
-		// (IE uses filter instead)
-		// Use a regex to work around a WebKit issue. See #5145
-		opacity: /^0.55/.test( a.style.opacity ),
-
-		// Verify style float existence
-		// (IE uses styleFloat instead of cssFloat)
-		cssFloat: !!a.style.cssFloat,
-
-		// Make sure that if no value is specified for a checkbox
-		// that it defaults to "on".
-		// (WebKit defaults to "" instead)
-		checkOn: ( input.value === "on" ),
-
-		// Make sure that a selected-by-default option has a working selected property.
-		// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
-		optSelected: opt.selected,
-
-		// Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7)
-		getSetAttribute: div.className !== "t",
-
-		// Tests for enctype support on a form(#6743)
-		enctype: !!document.createElement("form").enctype,
-
-		// Makes sure cloning an html5 element does not cause problems
-		// Where outerHTML is undefined, this still works
-		html5Clone: document.createElement("nav").cloneNode( true ).outerHTML !== "<:nav></:nav>",
-
-		// Will be defined later
-		submitBubbles: true,
-		changeBubbles: true,
-		focusinBubbles: false,
-		deleteExpando: true,
-		noCloneEvent: true,
-		inlineBlockNeedsLayout: false,
-		shrinkWrapBlocks: false,
-		reliableMarginRight: true,
-		pixelMargin: true
-	};
-
-	// jQuery.boxModel DEPRECATED in 1.3, use jQuery.support.boxModel instead
-	jQuery.boxModel = support.boxModel = (document.compatMode === "CSS1Compat");
-
-	// Make sure checked status is properly cloned
-	input.checked = true;
-	support.noCloneChecked = input.cloneNode( true ).checked;
-
-	// Make sure that the options inside disabled selects aren't marked as disabled
-	// (WebKit marks them as disabled)
-	select.disabled = true;
-	support.optDisabled = !opt.disabled;
-
-	// Test to see if it's possible to delete an expando from an element
-	// Fails in Internet Explorer
-	try {
-		delete div.test;
-	} catch( e ) {
-		support.deleteExpando = false;
-	}
-
-	if ( !div.addEventListener && div.attachEvent && div.fireEvent ) {
-		div.attachEvent( "onclick", function() {
-			// Cloning a node shouldn't copy over any
-			// bound event handlers (IE does this)
-			support.noCloneEvent = false;
-		});
-		div.cloneNode( true ).fireEvent( "onclick" );
-	}
-
-	// Check if a radio maintains its value
-	// after being appended to the DOM
-	input = document.createElement("input");
-	input.value = "t";
-	input.setAttribute("type", "radio");
-	support.radioValue = input.value === "t";
-
-	input.setAttribute("checked", "checked");
-
-	// #11217 - WebKit loses check when the name is after the checked attribute
-	input.setAttribute( "name", "t" );
-
-	div.appendChild( input );
-	fragment = document.createDocumentFragment();
-	fragment.appendChild( div.lastChild );
-
-	// WebKit doesn't clone checked state correctly in fragments
-	support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked;
-
-	// Check if a disconnected checkbox will retain its checked
-	// value of true after appended to the DOM (IE6/7)
-	support.appendChecked = input.checked;
-
-	fragment.removeChild( input );
-	fragment.appendChild( div );
-
-	// Technique from Juriy Zaytsev
-	// http://perfectionkills.com/detecting-event-support-without-browser-sniffing/
-	// We only care about the case where non-standard event systems
-	// are used, namely in IE. Short-circuiting here helps us to
-	// avoid an eval call (in setAttribute) which can cause CSP
-	// to go haywire. See: https://developer.mozilla.org/en/Security/CSP
-	if ( div.attachEvent ) {
-		for ( i in {
-			submit: 1,
-			change: 1,
-			focusin: 1
-		}) {
-			eventName = "on" + i;
-			isSupported = ( eventName in div );
-			if ( !isSupported ) {
-				div.setAttribute( eventName, "return;" );
-				isSupported = ( typeof div[ eventName ] === "function" );
-			}
-			support[ i + "Bubbles" ] = isSupported;
-		}
-	}
-
-	fragment.removeChild( div );
-
-	// Null elements to avoid leaks in IE
-	fragment = select = opt = div = input = null;
-
-	// Run tests that need a body at doc ready
-	jQuery(function() {
-		var container, outer, inner, table, td, offsetSupport,
-			marginDiv, conMarginTop, style, html, positionTopLeftWidthHeight,
-			paddingMarginBorderVisibility, paddingMarginBorder,
-			body = document.getElementsByTagName("body")[0];
-
-		if ( !body ) {
-			// Return for frameset docs that don't have a body
-			return;
-		}
-
-		conMarginTop = 1;
-		paddingMarginBorder = "padding:0;margin:0;border:";
-		positionTopLeftWidthHeight = "position:absolute;top:0;left:0;width:1px;height:1px;";
-		paddingMarginBorderVisibility = paddingMarginBorder + "0;visibility:hidden;";
-		style = "style='" + positionTopLeftWidthHeight + paddingMarginBorder + "5px solid #000;";
-		html = "<div " + style + "display:block;'><div style='" + paddingMarginBorder + "0;display:block;overflow:hidden;'></div></div>" +
-			"<table " + style + "' cellpadding='0' cellspacing='0'>" +
-			"<tr><td></td></tr></table>";
-
-		container = document.createElement("div");
-		container.style.cssText = paddingMarginBorderVisibility + "width:0;height:0;position:static;top:0;margin-top:" + conMarginTop + "px";
-		body.insertBefore( container, body.firstChild );
-
-		// Construct the test element
-		div = document.createElement("div");
-		container.appendChild( div );
-
-		// Check if table cells still have offsetWidth/Height when they are set
-		// to display:none and there are still other visible table cells in a
-		// table row; if so, offsetWidth/Height are not reliable for use when
-		// determining if an element has been hidden directly using
-		// display:none (it is still safe to use offsets if a parent element is
-		// hidden; don safety goggles and see bug #4512 for more information).
-		// (only IE 8 fails this test)
-		div.innerHTML = "<table><tr><td style='" + paddingMarginBorder + "0;display:none'></td><td>t</td></tr></table>";
-		tds = div.getElementsByTagName( "td" );
-		isSupported = ( tds[ 0 ].offsetHeight === 0 );
-
-		tds[ 0 ].style.display = "";
-		tds[ 1 ].style.display = "none";
-
-		// Check if empty table cells still have offsetWidth/Height
-		// (IE <= 8 fail this test)
-		support.reliableHiddenOffsets = isSupported && ( tds[ 0 ].offsetHeight === 0 );
-
-		// Check if div with explicit width and no margin-right incorrectly