don't use private properties in the template
Merge branch 'master' into resource-picker
show available resources in the picker