Merge branch 'joomla3' of https://github.com/Fabrik/fabrik into joomla3
Merge branch 'joomla3' of github.com:jaanusnurmoja/fabrik into joomla3