Adding JomSocial plugin
Adding first cut of updated JomSocial plugin to 3.1
Commented out forced collation code for now, as it is breaking the main
list query if any goruping applied.  Need to work out where the
collation statement needs to go.
Small fix to _getFilterLabel() definition to match element model, in
user element.
Merge branch 'joomla3' of github.com:Fabrik/fabrik into joomla3

Conflicts:
	components/com_fabrik/models/list.php