ref #4028 - add detailView, minor changes in resource-directive
Merge remote-tracking branch 'origin/master'
ref #4028 - minor changes
Merge remote-tracking branch 'origin/master'