finalizing context thing
Merge branch 'master' of github.com:alleyinteractive/wordpress-fieldmanager

Conflicts:
	php/class-fieldmanager-field.php