[TR, MY] {other} modified string values
Merge branch 'client' into gui
[TR, MY] {test-after-code} added JUNIT-Tests for testing MainActivity layout
Merge branch 'client' into gui
Merge branch 'client' into gui
[TR, MY] {other} refactored name
[TR, MY] {other} refactoring of tests
Merge branch 'gui' into client