Type converters
Merging
Merging
Updating test for number of contenttypes
Merge branch 'typeConverters' into kirby