Merge branch 'master' of https://github.com/GeneralDoddi/RuFoos

Conflicts:
	.idea/workspace.xml
	src/com/example/RuFoos/TeamMatchRegistrationActivity.java
	src/com/example/RuFoos/match/MatchService.java
	src/com/example/RuFoos/match/MatchServiceData.java
Merge branch 'master' of https://github.com/GeneralDoddi/RuFoos

Conflicts:
	.idea/workspace.xml
	src/com/example/RuFoos/TeamMatchRegistrationActivity.java
	src/com/example/RuFoos/match/MatchService.java
	src/com/example/RuFoos/match/MatchServiceData.java
Merge branch 'master' of https://github.com/GeneralDoddi/RuFoos

Conflicts:
	.idea/workspace.xml
	res/layout/quickmatch.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/com/example/RuFoos/ExhibitionRegistrationActivity.java
Merge branch 'master' of https://github.com/GeneralDoddi/RuFoos

Conflicts:
	.idea/workspace.xml
	src/com/example/RuFoos/TeamMatchRegistrationActivity.java
	src/com/example/RuFoos/match/MatchService.java
	src/com/example/RuFoos/match/MatchServiceData.java