Merge pull request #295 from bcordis/development

Development
update jui form joomla-cms master