Add feeds_filemaker module and dependencies as submodules
[#839] Put all Feeds import pages in the admin theme
[gh-749] Update unl_four submodule pointer
[gh-842] Check that jQuery.fn.drupalSetSummary is defined

JS runs on all pages, including front end pages where that method is not available
[gh-841] Update TinyMCE submodule
[gh-844] Update unl_four submodule
[gh-846][gh-806] Remove $og_membership->group_type check

Unsure why it was added but it appears that it is always 'node'
so the code below never executes
[gh-846][gh-806] Reinstate $og_membership 'user' check with entity_type

b39f43c was likely a bug using group_type
[gh-852] Update Entity API module to 7.x-1.5

Also remove README note as this version contains the URI callback
fix: http://drupal.org/node/1481372
[gh-852] Update ctools module to 7.x-1.4
[gh-852] Upgrade webform to 7.x-3.20
Merge pull request #839 from ericras/feeds-filemaker

Add feeds_filemaker module and dependencies as submodules
Merge pull request #849 from ericras/issue-841

Closes #841 Update TinyMCE submodule
Merge pull request #850 from ericras/issue-844

Closes #844 Update unl_four submodule
Merge pull request #848 from ericras/issue-842

Closes #842 Check that jQuery.fn.drupalSetSummary is defined
Merge pull request #851 from ericras/issue-846

Closes #846 Fix $og_membership check
Merge pull request #853 from ericras/issue-852

Closes #852 Security updates to webform, entity, ctools
Merge branch 'develop' into issue-843

Conflicts:
	.gitmodules