Revert "Gradle build file fixes"
Merge pull request #715 from Wizcorp/revert-713-master

Revert "Gradle build file fixes"