Merge pull request #295 from bcordis/development

Development
update jui form joomla-cms master
Merge pull request #296 from bcordis/development

update jui form joomla-cms master
Merge branch 'development' of https://github.com/Joomla-Bible-Study/Joomla-Bible-Study into 282

Conflicts:
	plg_biblestudy_backup/jbsbackup.php
	plg_biblestudy_backup/jbsbackup.xml
	plg_biblestudy_backup/language/de-DE/de-DE.plg_system_jbsbackup.ini
	plg_biblestudy_backup/language/en-GB/en-GB.plg_system_jbsbackup.ini
	plg_biblestudy_finder/biblestudy.php
	plg_biblestudy_podcast/jbspodcast.php
	plg_biblestudy_podcast/jbspodcast.xml
	plg_biblestudy_podcast/language/de-DE/de-DE.plg_system_jbspodcast.ini
	plg_biblestudy_podcast/language/en-GB/en-GB.plg_system_jbspodcast.ini
Merge remote-tracking branch 'origin/282' into 282

Conflicts:
	plg_biblestudy_backup/jbsbackup.php
	plg_biblestudy_finder/biblestudy.php