Complete merge of taking picture ready and tested