Pulled from upstream development branch.
Merge branch 'development' of https://github.com/Joomla-Bible-Study/Joomla-Bible-Study into development
Merge branch 'development' of https://github.com/Joomla-Bible-Study/Joomla-Bible-Study into development
Merge branch 'development' of https://github.com/Joomla-Bible-Study/Joomla-Bible-Study into development
Merge branch 'development' of https://github.com/Joomla-Bible-Study/Joomla-Bible-Study into development
Merge branch 'development' of https://github.com/Joomla-Bible-Study/Joomla-Bible-Study into development
Merge branch 'development' of https://github.com/Joomla-Bible-Study/Joomla-Bible-Study into development
Merge branch 'development' of https://github.com/Joomla-Bible-Study/Joomla-Bible-Study into development
Merge branch 'development' of https://github.com/Joomla-Bible-Study/Joomla-Bible-Study into development
Pulled from upstream development branch.
Merge branch 'development' of https://github.com/Joomla-Bible-Study/Joomla-Bible-Study into development
Merge branch 'development' of https://github.com/Joomla-Bible-Study/Joomla-Bible-Study into development

Conflicts:
	build/packages/addons/com_jbsmigration.zip
	build/packages/addons/joomsef_com_biblestudy.zip
	build/packages/component/com_biblestudy.zip
	build/packages/modules/mod_biblestudy.zip
	build/packages/modules/mod_biblestudy_podcast.zip
	build/packages/pkg_biblestudy.zip
	build/packages/plugins/plg_biblestudy_backup.zip
	build/packages/plugins/plg_biblestudy_finder.zip
	build/packages/plugins/plg_biblestudy_podcast.zip
	build/packages/plugins/plg_biblestudy_search.zip
Merge branch 'development' of https://github.com/Joomla-Bible-Study/Joomla-Bible-Study into development

Conflicts:
	build/packages/addons/com_jbsmigration.zip
	build/packages/addons/joomsef_com_biblestudy.zip
	build/packages/component/com_biblestudy.zip
	build/packages/modules/mod_biblestudy.zip
	build/packages/modules/mod_biblestudy_podcast.zip
	build/packages/pkg_biblestudy.zip
	build/packages/plugins/plg_biblestudy_backup.zip
	build/packages/plugins/plg_biblestudy_finder.zip
	build/packages/plugins/plg_biblestudy_podcast.zip
	build/packages/plugins/plg_biblestudy_search.zip
Merge branch 'development' of https://github.com/Joomla-Bible-Study/Joomla-Bible-Study into development