Bumped gradle tools and build tools to latest versions
Merge branch 'master' into team_at_event_summary

Conflicts:
	gradle/wrapper/gradle-wrapper.properties
Merge branch 'team_at_event_summary' of github.com:the-blue-alliance/the-blue-alliance-android into team_at_event_summary

Conflicts:
	gradle/wrapper/gradle-wrapper.properties