changes that came from my laptop
Merge branch 'master' of github.com:brownrl/skeleton

Conflicts:
	admin/modules/typefields/pre-update.php