Merge branch 'develop' into feature/add-joomla-1.5-plugin
feature/add-joomla-1.5-plugin - Add Joomla 1.5 plugin
feature/add-joomla-1.5-plugin - Add jquery no conflict to prevent jquery conflict
feature/add-joomla-1.5-plugin - Change readme with version and add versions markdown
Merge branch 'master' into develop
Merge branch 'develop' into feature/add-joomla-1.5-plugin
 feature/add-joomla-1.5-plugin - delete email adres
Merge branch 'feature/add-joomla-1.5-plugin' into 'develop'

Feature/add joomla 1.5 plugin

Source branch mag weg.
Merge branch 'develop' into 'master'

Develop