Fix conflict on joomla3
Merge pull request #15 from luredweb/master

Fix conflict on joomla3