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

openlp/core/common/__init__.py (+16/-1)
openlp/core/common/actions.py (+1/-1)
openlp/core/common/i18n.py (+4/-14)
openlp/core/common/registry.py (+2/-23)
openlp/core/display/html/display.js (+29/-22)
openlp/core/display/render.py (+1/-1)
openlp/core/display/screens.py (+2/-10)
openlp/core/lib/theme.py (+1/-0)
openlp/core/state.py (+2/-11)
openlp/core/ui/advancedtab.py (+1/-1)
openlp/core/ui/icons.py (+4/-14)
openlp/plugins/bibles/lib/__init__.py (+23/-29)
openlp/plugins/bibles/lib/db.py (+22/-25)
openlp/plugins/bibles/lib/manager.py (+4/-2)
openlp/plugins/custom/forms/editcustomdialog.py (+2/-0)
openlp/plugins/songs/forms/editsongdialog.py (+2/-0)
openlp/plugins/songs/lib/db.py (+3/-1)
openlp/plugins/songs/lib/importers/cclifile.py (+2/-0)
openlp/plugins/songs/lib/importers/dreambeam.py (+2/-1)
openlp/plugins/songs/lib/importers/easyslides.py (+2/-0)
openlp/plugins/songs/lib/importers/easyworship.py (+1/-1)
openlp/plugins/songs/lib/importers/songbeamer.py (+1/-1)
tests/functional/openlp_core/common/test_common.py (+43/-1)
tests/functional/openlp_core/lib/test_theme.py (+1/-1)
tests/functional/openlp_core/ui/test_icons.py (+1/-1)