working on global
Merge branch 'frontend-iter2' of https://github.com/dylanling/airserve into frontend-iter2

Conflicts:
	AirServe/bin/AirServe.apk
	AirServe/bin/classes.dex