arreglo base de datos
Merge branch 'Newly' of https://github.com/capotapps/ekhcEiHsdtT.git
into Newly

Conflicts:
	EfETsvxljoU/bin/R.txt
	EfETsvxljoU/src/fefsv/fgewr/efetsvxljou/BaseDeDatos.java
	appcompat_v7/bin/android-support-v7-appcompat.jar
	gridlayout_v7/bin/android-support-v7-gridlayout.jar