Gradle updates, fixed manifest for merging, added cwac- to JAR