Small clean-up on adding meta-data to resources.
Merge branch 'development' of github.com:tdt/core into development