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/background/PopulateTeamAtEvent.java
	android/src/main/java/com/thebluealliance/androidclient/background/event/PopulateEventInfo.java
	android/src/main/java/com/thebluealliance/androidclient/helpers/MatchHelper.java
	android/src/main/res/layout/fragment_event_info.xml
	android/src/main/res/layout/fragment_team_info.xml

More UI tweaks.