FR2 is now finished

FR 2 is now finished. File is saved as XML, uploadedto the server and
then deleted from the device. Some refactoring left and to finish the
test cases.