Merge branch 'choigoon' into develop
Merge branch 'develop' of https://github.com/Family-of-loves/Android.git
into develop