Merge branch 'master' of https://github.com/dylanling/airserve into frontend-iter3
android logic running
Merge branch 'master' of https://github.com/dylanling/airserve