building with gradle
Merge commit 'edd537262783787d8310d2b935c892f950f1ac10'