__
Merge branch 'development' of https://github.com/genu/Joomla-Bible-Study into development

Conflicts:
	build/packages/component/com_biblestudy.zip