Fixed up some merge conflicts. Took a first stab at fixing a minor problem with the blockBeam() function in AMSampleCamera, needs more work.
Fixed minor merge conflicts.