Merge changes from the calguy_templateswitching branch.


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


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