update
Merge branch 'master' of https://github.com/twolight/Android-Fast-Development