Merge pull request #45 from wdlindmeier/devBill

Pulled cam convergence into composite app
First stab at merging the camera converge shot with layout