Remove action calls wherever the default action will suffice
Resolve merge conflicts
Re-align resource attributes
Merge pull request #13 from elm-city-craftworks/use-defaults

Remove action calls wherever the default action will suffice