<falta o webservice>
Merge remote-tracking branch 'origin/rafael'

Conflicts:
	platforms/android/CordovaLib/ant-build/AndroidManifest.xml.d
	platforms/android/CordovaLib/ant-build/build.prop
	platforms/android/CordovaLib/ant-build/classes.jar
	platforms/android/ant-build/AndroidManifest.xml.d
	platforms/android/ant-build/CordovaApp-debug-unaligned.apk.d
	platforms/android/ant-build/CordovaApp.ap_.d
	platforms/android/ant-build/build.prop
	platforms/android/ant-build/classes.dex.d
	platforms/android/assets/www/css/index.css
	platforms/android/assets/www/index.html
	platforms/android/assets/www/js/index.js
	www/js/index.js