Se unificó el boton "Desconectar" y "Cerrar conexiones"
Se modificó la clase "Desconectar" para que integre clearWatchList y
clearEventList
Se modifico el textLabel de ARView
Agrego la modificación del master al develop y hago merge con master.
Boton cerrar conexiones y etiqueta de la pantall de ARView
Merge branch 'develop'

Conflicts:
	mim/bin/R.txt
	mim/bin/classes/edu/tesina/mim/MainActivity$10.class
	mim/bin/classes/edu/tesina/mim/MainActivity$11.class
	mim/bin/classes/edu/tesina/mim/MainActivity$12.class
	mim/bin/classes/edu/tesina/mim/MainActivity$7$1.class
	mim/bin/classes/edu/tesina/mim/MainActivity$7$2.class
	mim/bin/classes/edu/tesina/mim/MainActivity$7.class
	mim/bin/classes/edu/tesina/mim/MainActivity$8.class
	mim/bin/classes/edu/tesina/mim/MainActivity$9.class
	mim/bin/classes/edu/tesina/mim/MainActivity$AssetsExtracter.class
	mim/bin/classes/edu/tesina/mim/MainActivity.class
	mim/gen/edu/tesina/mim/R.java
	mim/src/edu/tesina/mim/MainActivity.java