Prepend post type if more than 1
Merge branch 'display-post-type' into dev

Conflicts:
	classes.fields.php