Large commit
Merge branch 'master' of https://github.com/manojvsj/efi_opportunity_hack

Conflicts:
	from_scratch/testing.php