Se realizaron las validaciones para saber si las butacas son libres o ocupadas
Creacion de proxObrasActivity
Creacion de ObrasVistasActivity
Suma de puntos a la compra
Creacion de proxObrasActivity
Creacion de ObrasVistasActivity
Suma de puntos a la compra
Commit para integrar con agus.
Se arreglo el programacionFragment
commit
Arreglo deslogin
Merged 'develop'.

Conflicts:
	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/.gitignore
	bin/classes/backend/DatabaseHelper.class
	bin/classes/backend/UpdateAdapter$UpdateViewHolder.class
	bin/classes/backend/UpdateAdapter.class
	bin/classes/backend/UsuarioBackend.class
	bin/classes/dominio/Obra$1.class
	bin/classes/dominio/Obra.class
	bin/classes/values/strings.xml
	bin/dexedLibs/android-support-v4-fb63c5da80fc4f331d415dfcb2cbb8ed.jar
	bin/dexedLibs/android-support-v7-appcompat-2cedf33b1d6eada651cd76e252ac86b1.jar
	bin/dexedLibs/android-support-v7-appcompat-805350b1f6ad45575889a00f54f85dca.jar
	bin/dexedLibs/android-support-v7-gridlayout-64aef877cc50637162594e4c4377d7bb.jar
	bin/dexedLibs/android-support-v7-gridlayout-f8e879f2224b04e02074f23906fc73d3.jar
	bin/dexedLibs/annotations-24cba75d16355ebfc68d9abd824cdc9f.jar
	bin/dexedLibs/captureactivity-6b08946918df3dc3cd90bebfb3430c70.jar
	bin/dexedLibs/core-b9adcbc96d54f48a5c7f42165094aee3.jar
	bin/dexedLibs/google-http-client-1.16.0-rc-3be543c360417c8a1bb2ff7ee089a1e0.jar
	bin/dexedLibs/google-http-client-android-1.16.0-rc-e1d9268b79862a1c3de7fe645f27a2cb.jar
	bin/dexedLibs/google-http-client-gson-1.16.0-rc-c19b59950e9ecc2f9c50783d209962c2.jar
	bin/dexedLibs/gson-2.1-484f668e307a886d809f307d184ce36b.jar
	bin/dexedLibs/guava-14.0.1-e9f41b13332d90fa7acc29cb678e79a5.jar
	bin/dexedLibs/kinvey-android-lib-2.6.14-6ea7114ca885b626498480cd77ba4c0d.jar
	bin/dexedLibs/kinvey-java-2.6.14-a817389ee08dede84bd5e94b547eff04.jar
	bin/resources.ap_
	gen/android/support/v7/appcompat/R.java
	gen/com/example/clientarte/R.java
	gen/com/google/zxing/client/android/R.java
	project.properties
	res/values/strings.xml
	src/backend/UsuarioBackend.java
	src/com/example/clientarte/MainActivity.java
	src/com/example/clientarte/NosotrosActivity.java
	src/com/example/clientarte/NotificacionesActivity.java
	src/com/example/clientarte/NovedadesActivity.java
	src/com/example/clientarte/ObjetosBackend.java
	src/com/example/clientarte/PerfilFragment.java
commit integracion
Finish ValidacionesCompra