Minor updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/AirBus.apk
	bin/classes.dex
	gen/com/aidilab/airbus/R.java