Merge branch 'master' of https://github.com/the-blue-alliance/the-blue-alliance-android into material_keylines

Conflicts:
	android/src/main/java/com/thebluealliance/androidclient/activities/ViewMatchActivity.java
	android/src/main/java/com/thebluealliance/androidclient/background/PopulateTeamAtEvent.java
	android/src/main/java/com/thebluealliance/androidclient/background/event/PopulateEventAwards.java
	android/src/main/java/com/thebluealliance/androidclient/background/event/PopulateEventInfo.java
	android/src/main/java/com/thebluealliance/androidclient/background/match/PopulateMatchInfo.java
	android/src/main/java/com/thebluealliance/androidclient/fragments/event/EventInfoFragment.java
	android/src/main/java/com/thebluealliance/androidclient/models/Team.java
	android/src/main/res/layout/list_item_event_type_header.xml
	android/src/main/res/values/strings_team_at_event.xml