allow 'label' parameter on {content...} tag to override whatever label was specified in the module/whatever.


git-svn-id: http://svn.cmsmadesimple.org/svn/cmsmadesimple@9626 3d254a34-79dc-0310-9e5f-be208747d8a0