Add 'untemplate' action. Change modal options if an object is a temp…#512

DavidHenne wants to merge 2 commits intomastercastlecms/castle.cms:masterfrom

dh/template_bug_fixescastlecms/castle.cms:dh/template_bug_fixesCopy head branch name to clipboard