#267 - Merging build.gradle and deploy.gradle.  Updating Build Tools Version.  Removing TestFlightLib.jar as it isn't in use.