Add tags dict for arbitrary categorization of resources
Merge remote-tracking branch 'origin/master'