Merge lp://qastaging/~trb143/openlp/cleanups02182 into lp://qastaging/openlp

openlp/core/api/endpoint/controller.py (+3/-3)
openlp/core/common/__init__.py (+8/-8)
openlp/core/lib/serviceitem.py (+8/-1)
openlp/core/ui/firsttimewizard.py (+0/-14)
openlp/core/ui/media/mediacontroller.py (+0/-1)
openlp/core/ui/servicemanager.py (+4/-12)
openlp/core/ui/slidecontroller.py (+20/-6)
openlp/core/ui/thememanager.py (+2/-2)
openlp/core/widgets/toolbar.py (+11/-5)
openlp/core/widgets/views.py (+9/-2)
openlp/plugins/custom/lib/mediaitem.py (+24/-0)
openlp/plugins/songs/lib/db.py (+1/-1)
openlp/plugins/songs/lib/mediaitem.py (+29/-0)
openlp/plugins/songs/lib/songstab.py (+11/-0)
openlp/plugins/songs/songsplugin.py (+1/-0)
scripts/websocket_client.py (+1/-0)
tests/functional/openlp_core/api/endpoint/test_controller.py (+25/-3)
tests/functional/openlp_plugins/songs/test_mediaitem.py (+4/-2)