Merge lp://qastaging/~phill-ridout/openlp/fixes-I into lp://qastaging/openlp

openlp/core/api/deploy.py (+2/-2)
openlp/core/app.py (+8/-4)
openlp/core/common/__init__.py (+2/-2)
openlp/core/common/path.py (+1/-1)
openlp/core/common/settings.py (+1/-1)
openlp/core/display/html/display.html (+1/-1)
openlp/core/display/html/display.js (+1/-1)
openlp/core/lib/__init__.py (+6/-8)
openlp/core/lib/db.py (+15/-11)
openlp/core/lib/mediamanageritem.py (+6/-6)
openlp/core/lib/serviceitem.py (+3/-3)
openlp/core/ui/advancedtab.py (+1/-1)
openlp/core/ui/exceptiondialog.py (+3/-3)
openlp/core/ui/exceptionform.py (+14/-7)
openlp/core/ui/generaltab.py (+0/-1)
openlp/core/ui/mainwindow.py (+1/-1)
openlp/core/ui/servicemanager.py (+13/-12)
openlp/core/ui/thememanager.py (+10/-10)
openlp/core/version.py (+1/-1)
openlp/core/widgets/edits.py (+1/-1)
openlp/core/widgets/wizard.py (+1/-41)
openlp/plugins/bibles/forms/bibleimportform.py (+2/-2)
openlp/plugins/bibles/lib/bibleimport.py (+2/-2)
openlp/plugins/bibles/lib/db.py (+6/-6)
openlp/plugins/bibles/lib/importers/wordproject.py (+1/-1)
openlp/plugins/bibles/lib/manager.py (+1/-1)
openlp/plugins/bibles/lib/mediaitem.py (+3/-3)
openlp/plugins/custom/lib/mediaitem.py (+3/-6)
openlp/plugins/images/lib/mediaitem.py (+3/-3)
openlp/plugins/media/lib/mediaitem.py (+7/-7)
openlp/plugins/presentations/lib/mediaitem.py (+3/-3)
openlp/plugins/presentations/lib/messagelistener.py (+2/-8)
openlp/plugins/songs/forms/songimportform.py (+7/-2)
openlp/plugins/songs/lib/importers/cclifile.py (+4/-3)
openlp/plugins/songs/lib/mediaitem.py (+2/-4)
openlp/plugins/songusage/forms/songusagedetailform.py (+2/-2)
run_openlp.py (+8/-2)
tests/functional/openlp_core/api/test_deploy.py (+2/-2)
tests/functional/openlp_core/common/test_init.py (+14/-8)
tests/functional/openlp_core/common/test_path.py (+3/-5)
tests/functional/openlp_core/lib/test_serviceitem.py (+4/-4)
tests/functional/openlp_core/ui/test_thememanager.py (+3/-3)
tests/functional/openlp_plugins/bibles/test_manager.py (+3/-2)
tests/interfaces/openlp_plugins/songs/forms/test_songmaintenanceform.py (+2/-2)
tests/openlp_core/common/test_network_interfaces.py (+1/-1)
tests/openlp_core/projectors/test_projector_pjlink_commands_01.py (+6/-6)
tests/openlp_core/projectors/test_projector_sourceform.py (+2/-2)