#184: templates updated to handle deleted items.
Merge branch 'dev' of github.com:devbridge/BetterCMS into dev