Merge branch 'master' of git://github.com/Fabrik/fabrik
Merge branch 'master' of git://github.com/Fabrik/fabrik

Conflicts:
	plugins/fabrik_element/link/link.php
Merge branch 'master' of git://github.com/Fabrik/fabrik
Merge branch 'master' of git://github.com/Fabrik/fabrik
String changes to textarea
improved error checking in error notice code
fixes #688 on forms with >2 repeat groups we werent resetting the primary key lookup value in _reduceDataForXRepeatedJoins, which meant data was removed incorrectly form the form
fixes #688 on forms with >2 repeat groups we werent resetting the primary key lookup value in _reduceDataForXRepeatedJoins, which meant data was removed incorrectly form the form
Merge branch 'master' of github.com:Fabrik/fabrik
added: inline edit plugin takes into account caneditrow plugin options
Merge branch 'master' of git://github.com/Fabrik/fabrik

Conflicts:
	administrator/components/com_fabrik/models/forms/list.xml