JoinGameActivityCreated
JoinGameActivityModified
Merge branch 'master' of https://github.com/Hannanina/GuessTag

Conflicts:
	GuessTag/bin/jarlist.cache
naaaaa