Due to the sdk camera refactor, I refactored the code from the CRC too. Now, the FinderScreen extends from CatchoomFinderActivity and the SingleShotScreen extends from CatchoomSingleSShotActivity. Added an options menu to control if we want to use finder mode or single-shot mode