Resuelto base de datos e imágenes
Merge branch 'BD-preguntas'

Conflicts:
	platforms/android/CordovaLib/ant-build/build.prop
	platforms/android/ant-build/HelloCordova-debug-unaligned.apk
	platforms/android/ant-build/HelloCordova-debug.apk
	platforms/android/ant-build/HelloCordova.ap_
	platforms/android/ant-build/HelloCordova.ap_.d
	platforms/android/ant-build/build.prop
	platforms/android/assets/www/index.html
	platforms/android/res/xml/config.xml
	platforms/ios/Espacio Deco/config.xml
	platforms/ios/cordova/console.log
	platforms/ios/www/index.html
	www/index.html