merge commit
made it possible to press back when user is in the camera