editing updates

still need to implement saving the scholarship, and the displaying of
the custom fields.
Merge branch 'master' of https://github.com/willstumpf/alex

Conflicts:
	admin.php