Added media support.
Merge branch 'develop' of https://github.com/tatemz/genesis-layouts

Conflicts:
	field-groups.php