new code
Merge branch 'master' of https://github.com/BritehouseMobile/FirstRoadAFI

Conflicts:
	platforms/android/CordovaLib/ant-build/AndroidManifest.xml.d
	platforms/android/CordovaLib/ant-build/classes.jar
	platforms/android/CordovaLib/ant-gen/R.java.d
	platforms/android/CordovaLib/bin/classes/.gitignore
	platforms/android/CordovaLib/gen/.gitignore
	platforms/android/CordovaLib/local.properties
	platforms/android/ant-build/AndroidManifest.xml.d
	platforms/android/ant-build/FirstRoadAFI-debug-unaligned.apk.d
	platforms/android/ant-build/classes.dex.d
	platforms/android/ant-gen/R.java.d
	platforms/android/local.properties