Development merge in Joomla-Bible-Study