Adding in some delete changes from server and correcting comment_dialog.ctp error.