offline data updates
Merge branch 'master' of github.com:the-blue-alliance/the-blue-alliance-android

Conflicts:
	android/src/main/java/com/thebluealliance/androidclient/background/team/PopulateTeamMedia.java