bug fix
Merge branch 'develop' of https://github.com/stevecfischer/scf-framework into develop

Conflicts:
	wfc_files/admin/wfc_update_script.php