fix #72
close #75
Merge branch 'master' into javadoc-comments

Conflicts:
	android/src/main/java/com/thebluealliance/androidclient/activities/ViewMatchActivity.java
	android/src/main/java/com/thebluealliance/androidclient/background/event/PopulateEventAwards.java