update
Merge branch 'master' of https://github.com/airshiplay/android
update skin drawable etc