Calvin commit
Merge branch 'master' of https://github.com/hengkysucanda/android
test 2