Merged with DC CMS

Merged DesignCity CMS changes & fixes with latest revision