Atualização Do Mochila de Criança

Ah, mei mundo de coisa. Principalmente Layout
Merge branch 'master' of https://github.com/OtacFerreiro/PDM---Project

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.cdt.core/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/E-Point/.indexes/a0/d6/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/E-Point/.indexes/e4/50/52/27/ca/26/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/E-Point/.indexes/e4/50/52/27/ca/aa/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/E-Point/.indexes/e4/50/52/27/ca/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/E-Point/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/E-Point/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/E-Point/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/E-Point/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
	.metadata/.plugins/org.eclipse.debug.core/.launches/E-Point.launch
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/2062311147.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/0.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/1.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/2.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/3.png
	.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	E-Point/.project
	E-Point/bin/AndroidManifest.xml
	E-Point/bin/E-Point.apk
	E-Point/bin/R.txt
	E-Point/bin/classes.dex
	E-Point/bin/classes/br/androidapp/banco/banco
	E-Point/bin/classes/br/androidapp/unialliance/e_point/LoginActivity.class
	E-Point/bin/classes/br/androidapp/unialliance/e_point/MainActivity.class
	E-Point/bin/classes/br/androidapp/unialliance/e_point/R$drawable.class
	E-Point/bin/classes/br/androidapp/unialliance/e_point/R$id.class
	E-Point/bin/classes/br/androidapp/unialliance/e_point/classes/UsuarioRepositorio.class
	E-Point/bin/classes/com/google/android/gms/R$drawable.class
	E-Point/bin/resources.ap_
	E-Point/gen/br/androidapp/unialliance/e_point/R.java
	E-Point/gen/com/google/android/gms/R.java
	E-Point/res/layout/activity_login.xml
	E-Point/src/br/androidapp/unialliance/e_point/LoginActivity.java
	E-Point/src/br/androidapp/unialliance/e_point/MainActivity.java
	E-Point/src/br/androidapp/unialliance/e_point/classes/UsuarioRepositorio.java
	google-play-services_lib/bin/google-play-services_lib.jar