Rewrote resource item templates
Merged with origin/master