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/ViewEventActivity.java
	android/src/main/res/layout/activity_launch.xml