merge master
Merge branch 'joomla3' of github.com:Fabrik/fabrik into joomla3