cedan update
Merge branch 'master' of github.com:momoplan/Android