modified:   openzix/www/html/encuesta.html
Merge branch 'master' of https://github.com/jairosolarte/phonegap-openzix

Conflicts:
	openzix/platforms/android/CordovaLib/ant-build/AndroidManifest.xml.d
	openzix/platforms/android/CordovaLib/ant-build/build.prop
	openzix/platforms/android/CordovaLib/ant-build/classes.jar
	openzix/platforms/android/CordovaLib/ant-gen/R.java.d
	openzix/platforms/android/ant-build/AndroidManifest.xml.d
	openzix/platforms/android/ant-build/Openzix-debug-unaligned.apk.d
	openzix/platforms/android/ant-build/Openzix.ap_.d
	openzix/platforms/android/ant-build/build.prop
	openzix/platforms/android/ant-build/classes.dex.d
	openzix/platforms/android/ant-gen/R.java.d
Merge branch 'master' of https://github.com/jairosolarte/phonegap-openzix
formulario envia datos