Fixed Camera functional tests to work with changes made to Filmstrip.
Merge pull request #25 from justindarc/camera-refactor-rebased-rebased-rebased

Fixed Camera functional tests to work with changes made to Filmstrip.