Adding a resource form type
Merge pull request #1772 from aRn0D/resource/base-form

[WIP] Adding a resource form type
Fix behat context & fixtures after latest merges
Merge pull request #1809 from stloyd/bugfix/broken_behat

Fix behat context & fixtures after latest merges