Hotfix
Disable the DB fix button
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	com_biblestudy/admin/install/updates/6.1.4.php
Fix fields that need to be deleted from #__bsms_servers
Merge remote-tracking branch 'origin/development' into development