Progress dialog cancellable on back
Merge branch 'fix/bugfix_sprint_19' into develop2