Moved to gradle
Merge branch 'gradle-migration'