Merged With DC Framework

Merged classes with DesignCity CMS/Framework changes