blabla
Merge remote-tracking branch 'origin/master'

Conflicts:
	GuessTag/src/com/example/guesstag/JoinGameActivity.java