gradle
Fixed drawable
Merged with parent
refactor
Merge branch 'develop'