Typos in element's subOpts
should now migrate list/form/validation plugins
Update upgrade.php
Merge pull request #1027 from trob/upgrade21

Upgrade2.1 should now migrate list/form/validation plugins
Merge branch 'master' of git://github.com/Fabrik/fabrik
Fix Issue 1003
Merge pull request #1003 from Sophist-UK/fix_issue_1002

Fix issue 1002
Merge branch 'master' of git://github.com/Fabrik/fabrik into related_data_links_form_view
Correct links to related data (form/details) +whoops
related data links: code style & cleanup
Fix to upload image model, wasn't correctly detecting list view on
backend.
Adding stuff to gitignore
Merge pull request #1016 from jaanusnurmoja/related_data_links_form_view

Seems to be the only way to make correct urls in related data links...
Merge branch 'master' of git://github.com/Fabrik/fabrik

Conflicts:
	administrator/components/com_fabrik/language/en-GB/en-GB.com_fabrik.ini
	components/com_fabrik/models/form.php