copy changes from 1.x series to News 2.x


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