Version bump.
Include a Resource's fields in dir(resource).
Merge branch 'master' into dev