updated java files from something but worked on the index file
Merge branch 'master' of https://github.com/fmeade/RUAgenda

Conflicts:
	ruagenda/platforms/android/CordovaLib/bin/AndroidManifest.xml.d
	ruagenda/platforms/android/CordovaLib/bin/build.prop
	ruagenda/platforms/android/CordovaLib/bin/classes.jar
	ruagenda/platforms/android/CordovaLib/gen/R.java.d
	ruagenda/platforms/android/CordovaLib/local.properties
	ruagenda/platforms/android/bin/AndroidManifest.xml.d
	ruagenda/platforms/android/bin/RUAgenda-debug-unaligned.apk
	ruagenda/platforms/android/bin/RUAgenda-debug-unaligned.apk.d
	ruagenda/platforms/android/bin/RUAgenda-debug.apk
	ruagenda/platforms/android/bin/RUAgenda.ap_
	ruagenda/platforms/android/bin/RUAgenda.ap_.d
	ruagenda/platforms/android/bin/build.prop
	ruagenda/platforms/android/bin/classes.dex.d
	ruagenda/platforms/android/bin/dexedLibs/classes-0b63202ecd6cd748ac113b77485cea7b.jar
	ruagenda/platforms/android/gen/R.java.d
	ruagenda/platforms/android/local.properties