Fixed import bug for content types.
Merge branch 'test' into dev