Saving some commented out, work-in-progress test code.
Merge branch 'joomla3' of github.com:Fabrik/fabrik into joomla3