possible fix for #1014 - conflict with advanced module manager
Merge branch 'joomla3' of github.com:Fabrik/fabrik into joomla3