Merge branch 'develop'
to master
Merge branch 'master' of https://github.com/skyland312/android-custom-view into develop