Fixed build.gradle, now correctly copies classes
Merge origin/master