Merge branch 'Bitra2' into Bitra.LA.2.0

 Conflicts:
	README.android
	README.version