Changed how Camera&Photo is called from SwipeSuper

Making it so that cameraandphoto is an activity called by another
activity.