Development branch from tomfuller2 merging with Joomla-Bible-Study development