main activity
merged main activity
Merge branch 'master' of github.com:schreon/matchmaking-client
targetAPI annotation to avoid errors caused by android studio bugs