Merge CM CMS

comfortable_mexican_sofa cms + active_admin merge