Funcionalidades del commit terminadas:

- login (pasar objeto cuando vuelve atras) - FINALIZADO
-  comunidad (que se listen los registros) - FINALIZADO
segundo commit
Commit con los siguientes puntos implementados:

- login (pasar objeto cuando vuelve atras) - FINALIZADO
-  comunidad (que se listen los registros) - FINALIZADO
Finish backendObra
Finish Feature-1

Conflicts:
	.classpath
	AndroidManifest.xml
	android-support-v7-appcompat/bin/android-support-v7-appcompat.jar
	android-support-v7-gridlayout/bin/android-support-v7-gridlayout.jar
	bin/AndroidManifest.xml
	bin/ClientArte.apk
	bin/R.txt
	bin/classes.dex
	bin/classes/values/strings.xml
	bin/dexedLibs/android-support-v7-appcompat-2d693609b1163d681e9ce4f7b2385026.jar
	bin/dexedLibs/android-support-v7-gridlayout-f25f048a490c897bb8f7c9c8fd7ddbbb.jar
	bin/dexedLibs/google-http-client-1.16.0-rc-3ca660ee1954a11b24cf0d76bb4a3dc3.jar
	bin/dexedLibs/google-http-client-android-1.16.0-rc-05fd52813735903c434dd2c8e1410ad4.jar
	bin/dexedLibs/google-http-client-gson-1.16.0-rc-20d104ad2adfa927ffe9c74b454bc416.jar
	bin/dexedLibs/gson-2.1-c9d7c9061593ba0a008e35117df191c6.jar
	bin/dexedLibs/guava-14.0.1-e1324071c308dc72c19dfd49d790bed5.jar
	bin/dexedLibs/kinvey-android-lib-2.6.14-b31ff8d15538c739d4913b53894fd850.jar
	bin/dexedLibs/kinvey-java-2.6.14-6529144a83c86c4fda376feb76ca06fa.jar
	bin/resources.ap_
	res/layout/activity_login_old.xml
	res/values/strings.xml
	src/com/example/clientarte/ComunidadActivity.java
	src/com/example/clientarte/LoginActivity_OLD_UNO.java
Commit2
borradas
n
p
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	bin/R.txt
	gen/com/example/clientarte/R.java