merge devel-cms to devel-library