Added links to delete content, screens, and templates per #395
Merge remote-tracking branch 'upstream/master'
Left deletion check commented out - also renamed template method
Merge remote-tracking branch 'upstream/master'