created a onDestroy() method in CameraActivity and removed code from onResume()
Merge branch 'camera' of github.com:lisarythenlarsson/TensionCamApp into camera