oops forgot to enequeue media
Merge branch 'refs/heads/master' into tidy-scripts

Conflicts:
	classes.fields.php