oops - inverted logic
Merge branch 'master' into display-post-type

Conflicts:
	classes.fields.php
Merge branch 'display-post-type' into dev