gradle: fixed building process
Merge remote-tracking branch 'cristian/develop' into develop