Merge branch 'dev'
Fixing gradle
Fixing gradle configs
Merge branch 'master' into dev