Merge branches/sucs-site into trunk. This means dropping support for the generic CMS. It was bad anyway, got no updates and had security holes that were fixed in the sucs specific one.