Feature #38 Implemented - Added untrack to deleted resources; Added activity templating for new entities