Merge proposals dependent on lp:~phill-ridout/openlp/even-more-refactors

lp:~phill-ridout/openlp/even-more-refactors has no merge proposals.