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

Conflicts:
	platforms/android/ant-build/FirstRoadAFI.ap_.d