Base do jogo feita

Telas básicas com google maps rodando.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	AndroidManifest.xml
	gen/com/usp/thewirelezzgame/R.java
	res/layout/activity_tela__login.xml
	res/layout/activity_tela__partida.xml