Cleaned code
Merge branch 'current-sprint' into ISSUE-98-add-process-to-upload