build platform update shit
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/gen/R.java.d
	ruagenda/platforms/android/local.properties